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 | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
127 files changed, 205 insertions, 205 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 9bcb6e8e2938..c74605624733 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -252,7 +252,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) } } -int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) +SfxTabPage::sfxpg AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( pItemSet ) FillItemSet( pItemSet ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 3dfeecd8f3ff..61eb83c2dacd 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index bb92e78c095d..875c71f9c991 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -382,7 +382,7 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs) SetNumFormat(); } -int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) +SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( !pNumFormatter ) { diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index ff8bbe7e9d1b..3f0a99caa460 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index f3e0cfda0e2f..b6d9e46baa9b 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -64,7 +64,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index f27f2a4dd7fb..8d6d1bc16f58 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -263,7 +263,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; @@ -322,7 +322,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 6c3298ef3633..0686c81ceb3a 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -66,7 +66,7 @@ public: void EnableTransparency(bool bColor, bool bGraphic); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 244faa20fe6b..9e2ed6622c9d 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -56,7 +56,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; void SetTableMode(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 43d7d61e0b10..9a471ff3e048 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -148,7 +148,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: virtual ~SvxCharNamePage(); @@ -230,7 +230,7 @@ private: public: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -310,7 +310,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: @@ -355,7 +355,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 500bf7cb20ba..e6906f1c3244 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -60,7 +60,7 @@ private: void SetLinks (); protected: - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 5d8c23db8332..3fe91da9f651 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -168,7 +168,7 @@ public: virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; 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; virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } @@ -298,7 +298,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; 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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } @@ -364,7 +364,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; 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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } @@ -443,7 +443,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 SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -519,7 +519,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -605,7 +605,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -739,7 +739,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; XPropertyListRef GetPropertyList( XPropertyListType t ); void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 5db33305c9c8..31550706538a 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -215,7 +215,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -311,7 +311,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 SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } @@ -381,7 +381,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 SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 8d7392ac26ac..18769aee67b2 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -115,7 +115,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index e86667080114..edf9e40c8c17 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -78,7 +78,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; void SetInfoItem( const SvxNumberInfoItem& rItem ); void SetNumberFormatList( const SvxNumberInfoItem& rItem ) diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 83987766ba73..739249fbde20 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -114,7 +114,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -150,7 +150,7 @@ class SvxBulletPickTabPage : public SfxTabPage const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -193,7 +193,7 @@ class SvxNumPickTabPage : public SfxTabPage const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -238,7 +238,7 @@ class SvxBitmapPickTabPage : public SfxTabPage const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -350,7 +350,7 @@ class SvxNumOptionsTabPage : public SfxTabPage const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -450,7 +450,7 @@ public: virtual ~SvxNumPositionTabPage(); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index fac3304b3794..90dadaea13e8 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -185,7 +185,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 461f56a0a49c..e0ca89f29da9 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -94,7 +94,7 @@ private: DECL_LINK( AutoHdl_Impl, CheckBox* ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: @@ -159,7 +159,7 @@ class SvxParaAlignTabPage : public SfxTabPage virtual ~SvxParaAlignTabPage(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -204,7 +204,7 @@ public: void DisablePageBreak(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 94f34aa489ac..d293468214e7 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -131,7 +131,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void EnableAnchorTypes(sal_uInt16 nAnchorEnable); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 0bc84e35525c..39c761a5b15e 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -60,7 +60,7 @@ public: void DisableControls( const sal_uInt16 nFlag ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 5272a41bbb5a..ccc70d1b349b 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -155,7 +155,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -211,7 +211,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -256,7 +256,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; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index ae9b3be32c3b..e71e31b02df2 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1129,7 +1129,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) UpdateColorConfig(); } -int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SfxTabPage::sfxpg SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 509d9f13ab7a..494874831f6c 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -55,7 +55,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 107f3f1b6103..2ee207c85976 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -183,7 +183,7 @@ void OpenGLCfg::setForceOpenGL(bool bOpenGL) // class OfaMiscTabPage -------------------------------------------------- -int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SvxGeneralTabPage::sfxpg OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 565281129baf..f4b4ee73cd86 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK( OnFileDlgToggled, void* ); #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index d1504f90622e..9cb1c1b82ef1 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -431,7 +431,7 @@ void SvxGeneralTabPage::SetAddress_Impl() -int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 4c610886a7be..17e97d2853e3 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -884,7 +884,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) { } -int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 37c97c1c7b0c..2d137ba7bc33 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -171,7 +171,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 07011b6827ef..a8bac7001b03 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -102,7 +102,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes m_pNfGraphicObjectCache->SetLast( long( double( nSizeInBytes ) * BYTES2NF ) ); } -int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 666010fd3f10..1ba1a1ec4b95 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -53,7 +53,7 @@ private: inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 22b50889df06..8a80c500e9f4 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -298,7 +298,7 @@ void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs ) UpdateEnableControls(); } -int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 6a7d69015c1f..5c46ca9f8488 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -916,7 +916,7 @@ void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } @@ -1417,7 +1417,7 @@ void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 1fe7aed107ca..6be44956e12d 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1037,7 +1037,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s -int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) /* [Description] diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8a3a29a6180c..803779389026 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -576,7 +576,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) -int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 67c13dd69447..6df37aa3d3d8 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1171,7 +1171,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -1711,7 +1711,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox ) } -int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -2878,7 +2878,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -3442,7 +3442,7 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index eeac4d70eedf..c416ad7c267f 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -382,11 +382,11 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcZoom(); } -int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) FillItemSet( _pSet ); - return sal_True; + return LEAVE_PAGE; } /*-------------------------------------------------------------------- diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 04c8e6e18b38..da6c8e198d05 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -794,7 +794,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } -int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 921e7db53333..a725a70180e5 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -276,11 +276,11 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -435,11 +435,11 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) @@ -632,11 +632,11 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -863,11 +863,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -1192,11 +1192,11 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } -int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) +SfxTabPage::sfxpg SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) @@ -2954,7 +2954,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) m_pPreviewWIN->Invalidate(); } -int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) { @@ -2963,7 +2963,7 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) DistanceHdl_Impl(m_pIndentMF); FillItemSet(_pSet); } - return sal_True; + return LEAVE_PAGE; } bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 7b86c469f1de..ef8dc6a41b2c 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1450,7 +1450,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) -int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { // Inquiry whether the page margins are beyond the printing area. // If not, ask user whether they shall be taken. diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 7d1e2792d614..527f4f760079 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -599,7 +599,7 @@ void SvxStdParagraphTabPage::EnableRelativeMode() bRelativeMode = true; } -int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { ELRLoseFocusHdl( NULL ); @@ -1020,7 +1020,7 @@ SvxParaAlignTabPage::~SvxParaAlignTabPage() { } -int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -1786,7 +1786,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet ) m_pOrphanBox->SaveValue(); } -int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index f116816e4eaa..dcf3b945de4a 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1047,7 +1047,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) } } -int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 7772da14c25d..4d589e7fe55f 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -353,7 +353,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) -int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 882f185d32bd..944aff6abe8e 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -472,7 +472,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) InitPreview ( rSet ); } -int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet( _pSet ); @@ -932,7 +932,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( nDlgType == 0 ) // area dialog { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 371262628040..3ce5ff5b1696 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -215,7 +215,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) -int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) +SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 42baaadb31de..165736eb60ca 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -478,7 +478,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) -int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index a4b866ee1d91..b2c334883f91 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -228,7 +228,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) -int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( CheckChanges_Impl() == -1L ) return KEEP_PAGE; diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 7a7557bbab07..418a7ce500db 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -217,7 +217,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 0ebcf15f2deb..119d59948a5f 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -653,7 +653,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( nDlgType == 0 ) // Line dialog { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 66de7c9bffcf..9e947e89358d 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -194,7 +194,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) -int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 0c2ed94c4482..194b0cd8f2fa 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -172,7 +172,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) -int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index fe94d0e97481..e1121a6acd65 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -239,7 +239,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 9ec39aa8a152..5658f7aba4a8 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -326,7 +326,7 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) -int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -560,7 +560,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -996,7 +996,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) { 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; 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; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index ea485cbd6f14..2202754e7192 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -137,7 +137,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs ) return bAttrsChanged; } -int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 9dbc06600955..c1a0770a51fd 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -310,7 +310,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) } } -int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) { if ( pDlg ) { @@ -752,7 +752,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) } } -int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) { bool bPosInputOk = true; 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;} diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 110953960262..2bbb450b7482 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -157,9 +157,9 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) return false; } -int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { - int nReturn = KEEP_PAGE; + sfxpg nReturn = KEEP_PAGE; double fEps; if( m_pEdEps->GetValue( fEps ) && (fEps > 0.0) ) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 10dc87bc0a89..cceae3f5a8e0 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -68,7 +68,7 @@ void ScTpCompatOptions::Reset(const SfxItemSet *rCoreAttrs) m_pLbKeyBindings->SaveValue(); } -int ScTpCompatOptions::DeactivatePage(SfxItemSet* /*pSet*/) +SfxTabPage::sfxpg ScTpCompatOptions::DeactivatePage(SfxItemSet* /*pSet*/) { return KEEP_PAGE; } diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index fc8cd2bcd8f7..d9123a424ccf 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -71,7 +71,7 @@ void ScTpDefaultsOptions::Reset(const SfxItemSet* rCoreSet) m_pEdSheetPrefix->SaveValue(); } -int ScTpDefaultsOptions::DeactivatePage(SfxItemSet* /*pSet*/) +SfxTabPage::sfxpg ScTpDefaultsOptions::DeactivatePage(SfxItemSet* /*pSet*/) { return KEEP_PAGE; } diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index a1c40ce1107f..63a807db14cc 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -354,7 +354,7 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet) maCurrentConfig = maSavedConfig; } -int ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/) +SfxTabPage::sfxpg ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/) { // What's this method for ? return KEEP_PAGE; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index ae2d9def5809..c3f640cdfeb8 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -48,7 +48,7 @@ SfxTabPage* ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rA return new ScTpPrintOptions( pParent, *rAttrSet ); } -int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index dcc38d38f9d4..cc97343c182b 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -229,7 +229,7 @@ bool ScTpUserLists::FillItemSet( SfxItemSet* rCoreAttrs ) return bDataModified; } -int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 2308812e170b..a8a1532d2e17 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -210,7 +210,7 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) *pLocalOptions = static_cast<const ScTpViewItem*>(pItem)->GetViewOptions(); } -int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(pSetP); @@ -627,7 +627,7 @@ void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) { } -int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(pSetP); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 994067e639be..c09f0cd2be99 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -120,7 +120,7 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet ) SvxHFPage::ActivatePage( rSet ); } -int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) if ( pSetP ) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index ed56d2ed9e6b..6de677e6cb52 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -315,7 +315,7 @@ bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet ) return bDataChanged; } -int ScTablePage::DeactivatePage( SfxItemSet* pSetP ) +SfxTabPage::sfxpg ScTablePage::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); 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 ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b10cd7c9fc52..5627c40bfc9a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2167,9 +2167,9 @@ void SfxCustomPropertiesPage::Reset( const SfxItemSet* rItemSet ) } } -int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +SfxTabPage::sfxpg SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { - int nRet = LEAVE_PAGE; + sfxpg nRet = LEAVE_PAGE; if ( !m_pPropertiesCtrl->AreAllLinesValid() ) nRet = KEEP_PAGE; return nRet; @@ -2666,7 +2666,7 @@ void SfxCmisPropertiesPage::Reset( const SfxItemSet* rItemSet ) m_pPropertiesCtrl.setScrollRange(); } -int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +SfxTabPage::sfxpg SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { return LEAVE_PAGE; } diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index fc1d7dbb9246..6ad49be51c67 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -607,7 +607,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) -int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) +SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] @@ -624,7 +624,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) */ { - int nRet = SfxTabPage::LEAVE_PAGE; + sfxpg nRet = SfxTabPage::LEAVE_PAGE; if ( m_pNameRw->IsModified() ) { @@ -677,7 +677,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) return SfxTabPage::KEEP_PAGE; } bModified = true; - nRet |= (int)SfxTabPage::REFRESH_SET; + nRet = sfxpg(nRet | SfxTabPage::REFRESH_SET); } } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index fbd63402f0d8..3a3ce1b75720 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -159,7 +159,7 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet* /*rSet*/ ) ImplUpdateControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); } -int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) +SfxTabPage::sfxpg SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) { if( pItemSet ) FillItemSet( pItemSet ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 55c0556231aa..9434ab9184ed 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -200,7 +200,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& ) { } -int SfxTabPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) /* [Description] diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index c62b4b13c96f..54974addc7f2 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -1036,7 +1036,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) RangeHdl( 0 ); } -int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index aaea253bf8da..8455400d2a0c 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -278,7 +278,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) } -int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 54f9be13a9f2..20b8e9b3f01b 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -570,7 +570,7 @@ SwDropCapsPage::~SwDropCapsPage() { } -int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) +SfxTabPage::sfxpg SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) { if ( _pSet ) FillSet( *_pSet ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 610fc9f6305c..b5fb89873386 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -129,7 +129,7 @@ SwCondCollPage::~SwCondCollPage() } -int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) +SfxTabPage::sfxpg SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) FillItemSet(_pSet); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index a18dd071692e..2e9ea372b3e7 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -452,7 +452,7 @@ void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet(_pSet); diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 0d89e4f79d3e..73cb44d3647d 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -63,7 +63,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 9369b79660b1..575d865fb74f 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -315,7 +315,7 @@ void SwEnvPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -int SwEnvPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); if( _pSet ) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 288884a9a2d2..309ccc356e27 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -138,7 +138,7 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet&) m_pPrinterInfo->SetText(pPrt->GetName()); } -int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet(_pSet); diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index bee494477667..2c947d53c3a1 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -63,7 +63,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 363775d54d69..426816ec8e3c 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -468,12 +468,12 @@ void SwLabPage::ActivatePage(const SfxItemSet& rSet) Reset( &rSet ); } -int SwLabPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwLabPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SwLabPage::FillItem(SwLabItem& rItem) @@ -605,7 +605,7 @@ void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) UpdateFields(); } -int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); @@ -737,7 +737,7 @@ void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) Reset(&rSet); } -int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); @@ -825,7 +825,7 @@ void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) Reset(&rSet); } -int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 4a83c7867f72..9e9a216f5848 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -475,12 +475,12 @@ void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SwLabFmtPage::FillItem(SwLabItem& rItem) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 13dc53353229..a50d525ebcce 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -107,7 +107,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 469085fb968a..5574fce5de49 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -103,12 +103,12 @@ void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) Reset(&rSet); } -int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) { if ( _pSet ) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SwLabPrtPage::FillItem(SwLabItem& rItem) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 90d421cbd2b7..c011687f6cd7 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -59,7 +59,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index d7b3a5da2591..0aa045936d7e 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; @@ -119,7 +119,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; @@ -157,7 +157,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; @@ -193,7 +193,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index a779e47ee61c..c34899cb2361 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1252,12 +1252,12 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet) Update(NULL); } -int SwColumnPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SwColumnPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 2317ca1066ab..14f03807a490 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1702,7 +1702,7 @@ void SwFrmPage::ActivatePage(const SfxItemSet& rSet) m_pFollowTextFlowCB->SaveValue(); } -int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) +SfxTabPage::sfxpg SwFrmPage::DeactivatePage(SfxItemSet * _pSet) { if ( _pSet ) { @@ -1717,7 +1717,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) _pSet->Put( aAnc ); } - return sal_True; + return LEAVE_PAGE; } // swap left/right with inside/outside @@ -2515,11 +2515,11 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet ) return bModified; } -int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) { if( _pSet ) FillItemSet( _pSet ); - return sal_True; + return LEAVE_PAGE; } IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 898a1c69e568..6987ce803555 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -557,12 +557,12 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) ContourHdl(0); } -int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } // range check diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d9951f1bf2e5..9b1a47f9a2ed 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1236,7 +1236,7 @@ void SwTOXSelectTabPage::ActivatePage( const SfxItemSet& ) //nothing to do } -int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) _pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE, @@ -2068,7 +2068,7 @@ void SwTOXEntryTabPage::UpdateDescriptor() pCurrentForm->SetCommaSeparated(m_pCommaSeparatedCB->IsChecked()); } -int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) +SfxTabPage::sfxpg SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) { UpdateDescriptor(); return LEAVE_PAGE; @@ -3584,7 +3584,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) EnableSelectHdl(m_pParaLayLB); } -int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +SfxTabPage::sfxpg SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { GetForm() = *m_pCurrentForm; return LEAVE_PAGE; diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index ae35a0012cbf..cd9c26626de3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -398,12 +398,12 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) m_pPreviewWIN->Invalidate(); } -int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 930c73726911..c9ef5a1d1631 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -810,7 +810,7 @@ void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& ) LevelHdl(m_pLevelLB); } -int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) +SfxTabPage::sfxpg SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) { SwOutlineTabDialog::SetActNumLevel(nActLevel); return LEAVE_PAGE; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 68e6d1a1d510..809b09007fa9 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -350,12 +350,12 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) HeightModify(0); } -int SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) +SfxTabPage::sfxpg SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 76ab9a1c80a9..d4908da737a6 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -239,7 +239,7 @@ void SwTextGridPage::ActivatePage( const SfxItemSet& rSet ) m_pExampleWN->Invalidate(); } -int SwTextGridPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg SwTextGridPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index d902fd211895..5e9d71114e67 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -594,7 +594,7 @@ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) } -int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) { //os: VCL doesn't take care of making the active widget //in the dialog lose the focus @@ -705,7 +705,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) _pSet->Put(SwPtrItem(FN_TABLE_REP, pTblData)); } } - return sal_True; + return LEAVE_PAGE; } //Description: Page column configuration @@ -1105,7 +1105,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) } -int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -1164,7 +1164,7 @@ int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) } _pSet->Put(SwPtrItem( FN_TABLE_REP, pTblData )); } - return sal_True; + return LEAVE_PAGE; } SwTwips SwTableColumnPage::GetVisibleWidth(sal_uInt16 nPos) diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 5ff460d8962d..d5efa31c7e59 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -161,7 +161,7 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::DeactivatePage; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index da73ac61c573..f24a6051f4b3 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -69,7 +69,7 @@ friend class SwDropCapsPict; SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage(); - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; void FillSet( SfxItemSet &rSet ); DECL_LINK(ClickHdl, void *); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 466ca759f26c..1cbd63545850 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -108,7 +108,7 @@ public: static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 88099079a5bc..6d5ab8e198ee 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -128,7 +128,7 @@ class SwFrmPage: public SfxTabPage bool m_bIsMathBaselineAlignment; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); @@ -237,7 +237,7 @@ public: virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; class SwFrmURLPage : public SfxTabPage diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 91ed4d39929b..ad1a9cdc0f22 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -119,7 +119,7 @@ public: virtual ~SwNumPositionTabPage(); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 1581918966bf..0e1d24f4315e 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -125,7 +125,7 @@ public: void SetWrtShell(SwWrtShell* pShell); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 6d37616473a2..a1ab9bf6df1a 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -67,7 +67,7 @@ private: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 92a5d333c55a..62144bcbe8bd 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -91,7 +91,7 @@ public: virtual void Reset(const SfxItemSet *rSet) 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; }; #endif diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index b4bcbcf1ad7b..fc903b33627f 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -50,7 +50,7 @@ class SwCondCollPage : public SfxTabPage SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK( OnOffHdl, CheckBox* ); DECL_LINK( AssignRemoveHdl, PushButton*); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 3a230b940bc5..41f57750c17a 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -226,7 +226,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -438,7 +438,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -485,7 +485,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 20b162e8cfd4..cd69f5ca98d3 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -85,7 +85,7 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; DECL_LINK( RangeModifyHdl, MetricField * ); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index f89d66e7bb14..cfc07cfacaa7 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -86,7 +86,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) 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; }; // TabPage Format/Table/Columns @@ -136,7 +136,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) 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; }; |