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 /include/sfx2 | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
Diffstat (limited to 'include/sfx2')
| -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 |
4 files changed, 5 insertions, 5 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; } |