diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 16:43:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:02 +0200 |
| commit | 8a26a4053db946da7c8d8cdbf2444faf3c459291 (patch) | |
| tree | d1ace4e2666c741caad62ef79d05bcd1d60db8a0 /dbaccess/source/ui/dlg | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
Diffstat (limited to 'dbaccess/source/ui/dlg')
| -rw-r--r-- | dbaccess/source/ui/dlg/adminpages.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/adminpages.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/tablespage.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/tablespage.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 0d1510998831..ffb2c8d02df4 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -66,7 +66,7 @@ namespace dbaui SetExchangeSupport(true); } - int OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) + SfxTabPage::sfxpg OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) { diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 77f4278104a3..b866cd721f38 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -149,7 +149,7 @@ namespace dbaui protected: /// default implementation: call FillItemSet, call prepareLeave, - virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; + virtual sfxpg 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) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 3a1ef5dc854e..59d9af9d75be 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -389,9 +389,9 @@ namespace dbaui m_pTablesList->checkWildcard(m_pTablesList->getAllObjectsEntry()); } - int OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet) + SfxTabPage::sfxpg OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet) { - int nResult = OGenericAdministrationPage::DeactivatePage(_pSet); + sfxpg nResult = OGenericAdministrationPage::DeactivatePage(_pSet); // dispose the connection, we don't need it anymore, so we're not wasting resources try diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 37db79c853a9..bd1568a82f36 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -50,7 +50,7 @@ namespace dbaui public: virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE; using OGenericAdministrationPage::DeactivatePage; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; |