diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/dinfdlg.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/mgetempl.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/printopt.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
| -rw-r--r-- | include/svx/hdft.hxx | 2 | ||||
| -rw-r--r-- | include/svx/optgrid.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 9179c69d7d90..58c874cba363 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -518,7 +518,7 @@ protected: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); @@ -640,7 +640,7 @@ protected: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index e6f1f8e576ab..6b5ba434c562 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -94,7 +94,7 @@ protected: using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 4857ce4b1235..3fcf7a0fdd4e 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -89,7 +89,7 @@ private: protected: using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 2465321b3acd..b54d974f306e 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -272,7 +272,7 @@ public: using TabPage::ActivatePage; using TabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ); void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index ad0a5cc8cccd..53450d36491a 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -65,7 +65,7 @@ protected: static const sal_uInt16 pRanges[]; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 1d6e62b6c0f5..02c74ca42b05 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -108,7 +108,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; private: CheckBox* pCbxUseGridsnap; |