summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /dbaccess/source/ui/dlg
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx8
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx10
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx8
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx86
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx6
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx22
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx24
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx16
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx6
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx66
-rw-r--r--dbaccess/source/ui/dlg/dsnItem.hxx4
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx2
-rw-r--r--dbaccess/source/ui/dlg/finteraction.hxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx24
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx4
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.hxx4
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx14
19 files changed, 157 insertions, 157 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index b770d46cb251..eab21c756b3b 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -53,13 +53,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 );
+ virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_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 468a1cc7fa38..f037d36e334b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -58,9 +58,9 @@ namespace dbaui
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
- virtual bool FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
@@ -75,14 +75,14 @@ namespace dbaui
virtual ~OConnectionTabPage();
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
/** enables the test connection button, if allowed
*/
- virtual bool checkTestConnection();
+ virtual bool checkTestConnection() SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 8d5372ee0f1f..71386cfda2f9 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -51,10 +51,10 @@ namespace dbaui
static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- virtual bool FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
@@ -68,7 +68,7 @@ namespace dbaui
protected:
OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
- virtual bool checkTestConnection();
+ virtual bool checkTestConnection() SAL_OVERRIDE;
// nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
virtual ~OConnectionTabPageSetup();
};
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 150640c2d4ec..48bc687deb6e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -39,7 +39,7 @@ namespace dbaui
class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
@@ -48,9 +48,9 @@ namespace dbaui
virtual ~OSpreadSheetConnectionPageSetup();
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
};
@@ -58,7 +58,7 @@ namespace dbaui
class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
@@ -66,11 +66,11 @@ namespace dbaui
protected:
virtual ~OTextConnectionPageSetup();
- virtual sal_Bool prepareLeave();
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
- bool checkTestConnection();
+ virtual sal_Bool prepareLeave() SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_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;
private:
DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*);
@@ -80,15 +80,15 @@ namespace dbaui
class OLDAPConnectionPageSetup : public OGenericAdministrationPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
- virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
+ virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
DECL_LINK(OnEditModified,Edit*);
private:
@@ -118,13 +118,13 @@ namespace dbaui
static OGenericAdministrationPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
protected:
- virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
- virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
+ virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE;
+ virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
- virtual Link getControlModifiedLink();
+ virtual Link getControlModifiedLink() SAL_OVERRIDE;
private:
DECL_LINK( OnModified, Edit* );
@@ -146,11 +146,11 @@ namespace dbaui
static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
protected:
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual Link getControlModifiedLink() { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_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); }
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
@@ -179,12 +179,12 @@ namespace dbaui
static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
protected:
- virtual bool checkTestConnection();
+ virtual bool checkTestConnection() SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
@@ -214,10 +214,10 @@ namespace dbaui
DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
protected:
- virtual bool FillItemSet(SfxItemSet& _rSet);
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual ~OMySQLIntroPageSetup();
private:
@@ -236,7 +236,7 @@ namespace dbaui
class OAuthentificationPageSetup : public OGenericAdministrationPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
@@ -250,16 +250,16 @@ namespace dbaui
virtual ~OAuthentificationPageSetup();
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
};
// OFinalDBPageSetup
class OFinalDBPageSetup : public OGenericAdministrationPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
FixedText* m_pFTFinalHeader;
@@ -278,16 +278,16 @@ namespace dbaui
void enableTableWizardCheckBox( sal_Bool _bSupportsTableCreation);
/// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
- Link getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
+ Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); }
DECL_LINK(OnOpenSelected, CheckBox*);
protected:
virtual ~OFinalDBPageSetup();
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 347a11033765..fea0f40249ac 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -71,13 +71,13 @@ public:
OUString GetUser();
// must be overloaded by subclasses, but it isn't pure virtual
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_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 b8690b1a03e5..8e4800cf674d 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -39,7 +39,7 @@ namespace dbaui
}
// IWindowEventFilter
- virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const
+ virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE
{
return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED )
|| ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED )
@@ -57,7 +57,7 @@ namespace dbaui
}
// IWindowOperator
- virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const;
+ virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const SAL_OVERRIDE;
private:
const OUString m_sDisabledText;
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 60124052fd7f..181393681d3d 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -47,8 +47,8 @@ namespace dbaui
OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
- virtual bool SaveValue() { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl
- virtual bool Disable() { m_pSaveValue->Disable(); return true;} // bool return value only for stl
+ 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
};
template < class T > class ODisableWrapper : public ISaveValueWrapper
@@ -58,8 +58,8 @@ namespace dbaui
ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
- virtual bool SaveValue() { return true;} // bool return value only for stl
- virtual bool Disable() { m_pSaveValue->Disable(); return true;} // bool return value only for stl
+ 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
};
struct TSaveValueWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool>
@@ -144,24 +144,24 @@ namespace dbaui
sal_Bool getSelectedDataSource(OUString& _sReturn,OUString& _sCurr);
// svt::IWizardPageController
- virtual void initializePage();
- virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
- virtual bool canAdvance() const;
+ virtual void initializePage() SAL_OVERRIDE;
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
+ virtual bool canAdvance() const SAL_OVERRIDE;
void SetRoadmapStateValue( sal_Bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; }
bool GetRoadmapStateValue() const { return m_abEnableRoadmap; }
protected:
/// default implementation: call FillItemSet, call prepareLeave,
- virtual int DeactivatePage(SfxItemSet* pSet);
+ virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
/// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False
- virtual void Reset(const SfxItemSet& _rCoreAttrs);
+ virtual void Reset(const SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
/// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True
- virtual void ActivatePage(const SfxItemSet& _rSet);
+ virtual void ActivatePage(const SfxItemSet& _rSet) SAL_OVERRIDE;
// TabPage overridables
- virtual void ActivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
protected:
void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); }
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index db749f5c74a2..59c32bca0747 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 );
- virtual OUString getSelectedName( OUString& _out_rAliasName ) const;
- virtual bool isLeafSelected() const;
+ virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE;
+ virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE;
+ virtual bool isLeafSelected() const SAL_OVERRIDE;
// OContainerListener
- virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
TableListFacade::~TableListFacade()
@@ -237,13 +237,13 @@ public:
virtual ~QueryListFacade();
private:
- virtual void updateTableObjectList( bool _bAllowViews );
- virtual OUString getSelectedName( OUString& _out_rAliasName ) const;
- virtual bool isLeafSelected() const;
+ virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE;
+ virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE;
+ virtual bool isLeafSelected() const SAL_OVERRIDE;
// OContainerListener
- virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
QueryListFacade::~QueryListFacade()
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index d3196bcfa8a1..90a6d6fc00b2 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -72,7 +72,7 @@ namespace dbaui
bool m_bHasMaxRowScan;
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
@@ -80,13 +80,13 @@ namespace dbaui
virtual ~SpecialSettingsPage();
// OGenericAdministrationPage overridables
- virtual void implInitControls (const SfxItemSet& _rSet, sal_Bool _bSaveValue );
+ virtual void implInitControls (const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
void impl_initBooleanSettings();
@@ -108,7 +108,7 @@ namespace dbaui
m_aControlDependencies;
public:
- virtual bool FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
@@ -117,13 +117,13 @@ namespace dbaui
virtual ~GeneratedValuesPage();
// must be overloaded by subclasses, but it isn't pure virtual
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
DECL_LINK( OnCheckBoxClick, CheckBox * );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 9e50c1846ab6..59038c2f8297 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -893,10 +893,10 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
void doLoadAsync();
// XTerminateListener
- virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception);
- virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& Event ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
DECL_LINK( OnOpenDocument, void* );
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 4ea050dd4efc..32364c69d23e 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -67,7 +67,7 @@ namespace dbaui
sal_uInt32 m_nControlFlags;
public:
- virtual bool FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
protected:
@@ -76,20 +76,20 @@ namespace dbaui
virtual ~OCommonBehaviourTabPage();
// must be overloaded by subclasses, but it isn't pure virtual
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
};
// ODbaseDetailsPage
class ODbaseDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
private:
@@ -106,9 +106,9 @@ namespace dbaui
virtual ~ODbaseDetailsPage();
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
DECL_LINK( OnButtonClicked, Button * );
@@ -128,13 +128,13 @@ namespace dbaui
class OOdbcDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
FixedLine m_aFL_1;
CheckBox m_aUseCatalog;
@@ -144,13 +144,13 @@ namespace dbaui
class OUserDriverDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
FixedText m_aFTHostname;
Edit m_aEDHostname;
@@ -178,10 +178,10 @@ namespace dbaui
protected:
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
@@ -220,23 +220,23 @@ namespace dbaui
CheckBox m_aPasswordRequired;
protected:
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
};
// OOdbcDetailsPage
class OLDAPDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
FixedLine m_aFL_1;
FixedText m_aBaseDN;
@@ -266,7 +266,7 @@ namespace dbaui
class OTextDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
@@ -278,11 +278,11 @@ namespace dbaui
OUString m_aTextNone;
protected:
virtual ~OTextDetailsPage();
- virtual sal_Bool prepareLeave();
+ virtual sal_Bool prepareLeave() SAL_OVERRIDE;
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
};
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index 5ce57a7f8f4a..3d65b7982b33 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;
- virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
+ virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_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 4d8b1a33f416..6448d31e24e2 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -58,7 +58,7 @@ public:
OUString GetSelected() const { return m_pDatasource->GetSelectEntry();}
void Select( const OUString& _rEntry ) { m_pDatasource->SelectEntry(_rEntry); }
- virtual bool Close();
+ virtual bool Close() SAL_OVERRIDE;
protected:
DECL_LINK( ListDblClickHdl, ListBox * );
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx
index f3ab3acb63dd..f4ba6ff4db26 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 ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ~OFilePickerInteractionHandler();
};
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 6a712784f4b5..c99602885717 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -74,16 +74,16 @@ namespace dbaui
protected:
// SfxTabPage overridables
- virtual void Reset( const SfxItemSet& _rCoreAttrs );
+ virtual void Reset( const SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
- virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue );
+ virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_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);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
void onTypeSelected(const OUString& _sURLPrefix);
void initializeTypeList();
@@ -105,10 +105,10 @@ namespace dbaui
OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems );
protected:
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
- virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue );
- virtual void setParentTitle( const OUString& _sURLPrefix );
+ virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE;
+ virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE;
};
// OGeneralPageWizard
@@ -170,13 +170,13 @@ namespace dbaui
DocumentDescriptor GetSelectedDocument() const;
protected:
- virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
- virtual void GetFocus();
+ virtual void GetFocus() SAL_OVERRIDE;
- virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue );
- virtual OUString getDatasourceName( const SfxItemSet& _rSet );
- virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName );
+ virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE;
+ virtual OUString getDatasourceName( const SfxItemSet& _rSet ) SAL_OVERRIDE;
+ virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) SAL_OVERRIDE;
::std::vector< OUString>
m_aEmbeddedURLPrefixes;
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 286f46cb6bb9..97649f354470 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -51,8 +51,8 @@ namespace dbaui
void SetAdditionalModifyHdl(const Link& _rHdl);
protected:
- virtual bool WantMouseEvent() const { return true; }
- virtual void SetModifyHdl(const Link& _rHdl);
+ virtual bool WantMouseEvent() const SAL_OVERRIDE { return true; }
+ virtual void SetModifyHdl(const Link& _rHdl) SAL_OVERRIDE;
private:
void implCheckLinks();
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index 3be9826e31d1..4902cd8d600d 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -37,8 +37,8 @@ namespace dbaui
OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
- virtual bool operator==( const SfxPoolItem& _rItem ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const;
+ virtual bool operator==( const SfxPoolItem& _rItem ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const SAL_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 8230d73855bc..b66c0a59a8f5 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -85,7 +85,7 @@ namespace
{
}
- virtual Image getImage() const
+ virtual Image getImage() const SAL_OVERRIDE
{
if ( !m_defaultImage )
m_defaultImage = Image( ModuleRes( m_defaultImageID ) );
@@ -103,7 +103,7 @@ namespace
{
}
- virtual OUString getLabel() const
+ virtual OUString getLabel() const SAL_OVERRIDE
{
return m_label;
}
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 229170e19172..fd14e43aaf3d 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -51,12 +51,12 @@ namespace dbaui
OTableSubscriptionDialog* m_pTablesDlg;
public:
- virtual bool FillItemSet(SfxItemSet& _rCoreAttrs);
- virtual int DeactivatePage(SfxItemSet* _pSet);
+ virtual bool FillItemSet(SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+ virtual int DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE;
using OGenericAdministrationPage::DeactivatePage;
- virtual void StateChanged( StateChangedType nStateChange );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
/** will be called when the controls need to be resized.
*/
@@ -66,8 +66,8 @@ namespace dbaui
virtual ~OTableSubscriptionPage();
protected:
- virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
- virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
+ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
+ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
DECL_LINK( OnTreeEntryCompare, const SvSortData* );
DECL_LINK( OnTreeEntryChecked, Control* );
@@ -88,7 +88,7 @@ namespace dbaui
/// (un)check all entries
void CheckAll( sal_Bool bCheck = sal_True );
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE;
// checks the tables according to the filter given
// in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ...