SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg

Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634

34 files changed, 59 insertions, 59 deletions

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;
 
 };