SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg

Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634

22 files changed, 43 insertions, 43 deletions

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 )
     {