diff options
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/tabpages.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpcalc.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpcompatibility.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpdefaults.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpformula.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tphf.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpprint.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/tptable.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpusrlst.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tpview.hxx | 4 |
11 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 954232033c97..69f12bd23592 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -36,7 +36,7 @@ public: protected: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTabPageProtection( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 629eb735c7be..034e49f22e1c 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -37,7 +37,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTpCalcOptions( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 6ddeeeca0b1f..5ab6e547ee26 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -23,7 +23,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 251c3676a391..6580efd1e582 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -23,7 +23,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index adf1c64a8eac..cf901f130d4e 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -37,7 +37,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 526aad0f19be..c16d69b535de 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -43,7 +43,7 @@ protected: virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: PushButton* m_pBtnEdit; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index cc987a98adfc..f40137682c75 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -37,7 +37,7 @@ public: virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8eaf1ec057da..d4ad19165103 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -64,7 +64,7 @@ protected: virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; private: OUString aStrUndefined; @@ -121,7 +121,7 @@ protected: virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 8c9aada2c7db..a1021b3b5911 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -35,7 +35,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 5e84d88a0beb..c3286a23ad4d 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTpUserLists( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index e426d9c742a9..28778a16f783 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -76,7 +76,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; @@ -124,7 +124,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetDocument(ScDocument* pPtr){pDoc = pPtr;} |