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 /sd | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/tpoption.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 521a9c64bcb7..253e7142aa34 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -351,7 +351,7 @@ void SdTPAction::ActivatePage( const SfxItemSet& ) { } -int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) +SfxTabPage::sfxpg SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { if( pPageSet ) FillItemSet( pPageSet ); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 66eaeeb73030..cc69f5e8627a 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -321,7 +321,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) } } -int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) +SfxTabPage::sfxpg SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // check parser sal_Int32 nX, nY; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index bd1ac112877b..08abc0173b67 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -104,7 +104,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void Construct(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 58bd4e965c80..5ef18f4c4452 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -126,7 +126,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); |