diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-05 15:15:56 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:02:20 +0000 |
commit | 11b4a6ddce31f173f10b703eb63fde2c88c0bc70 (patch) | |
tree | 5f635db51172fd421dffbcadfa021530634567cd | |
parent | remove some manual ref counting in svx and xmloff (diff) | |
download | core-11b4a6ddce31f173f10b703eb63fde2c88c0bc70.tar.gz core-11b4a6ddce31f173f10b703eb63fde2c88c0bc70.zip |
Convert DeactivePage return code to scoped enum
Change-Id: Idd5372ad20fc6676864b31b3796f8b9bc0ad73dd
Reviewed-on: https://gerrit.libreoffice.org/25918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
136 files changed, 339 insertions, 344 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index b8de8916b537..908fd49b9d27 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -276,12 +276,12 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) } } -SfxTabPage::sfxpg AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) +DeactivateRC AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( pItemSet ) FillItemSet( pItemSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index dae55be9b20d..cfd4435bb933 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 1160f34b8e79..d53ba44dc376 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -416,12 +416,12 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs) SetNumFormat(); } -SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) +DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( !pNumFormatter ) { OSL_FAIL( "No NumberFormatter available" ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool bDateAxis = chart2::AxisType::DATE == m_nAxisType; @@ -527,12 +527,12 @@ SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) } if( ShowWarning( nErrStrId, pControl ) ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( pItemSet ) FillItemSet( pItemSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 0798240f1b0b..0224bf4c9003 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 84f0c50c9d6d..a16aec2a535d 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -525,7 +525,7 @@ void SvxHyperlinkTabPageBase::ActivatePage( const SfxItemSet& rItemSet ) ShowMarkWnd (); } -int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) +DeactivateRC SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) { // hide mark-wnd SetMarkWndShouldOpen( IsMarkWndVisible () ); @@ -547,7 +547,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) _pSet->Put( aItem ); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 666d825ec866..5f13d48c897b 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -75,9 +75,9 @@ void IconChoicePage::ActivatePage( const SfxItemSet& ) } -int IconChoicePage::DeactivatePage( SfxItemSet* ) +DeactivateRC IconChoicePage::DeactivatePage( SfxItemSet* ) { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool IconChoicePage::QueryClose() @@ -484,7 +484,7 @@ void IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); - int nRet = IconChoicePage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( pData ) { @@ -500,7 +500,7 @@ void IconChoiceDialog::DeActivatePageImpl () if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); - if ( ( IconChoicePage::LEAVE_PAGE & nRet ) == IconChoicePage::LEAVE_PAGE && + if ( ( DeactivateRC::LeavePage & nRet ) && aTmp.Count() ) { pExampleSet->Put( aTmp ); @@ -523,7 +523,7 @@ void IconChoiceDialog::DeActivatePageImpl () nRet = pPage->DeactivatePage( nullptr ); } - if ( nRet & IconChoicePage::REFRESH_SET ) + if ( nRet & DeactivateRC::RefreshSet ) { RefreshInputSet(); // flag all pages to be newly initialized @@ -720,7 +720,7 @@ bool IconChoiceDialog::OK_Impl() bool bEnd = !pPage; if ( pPage ) { - int nRet = IconChoicePage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( pSet ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); @@ -728,7 +728,7 @@ bool IconChoiceDialog::OK_Impl() if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); - if ( ( IconChoicePage::LEAVE_PAGE & nRet ) == IconChoicePage::LEAVE_PAGE + if ( ( DeactivateRC::LeavePage & nRet ) && aTmp.Count() ) { pExampleSet->Put( aTmp ); @@ -737,7 +737,7 @@ bool IconChoiceDialog::OK_Impl() } else nRet = pPage->DeactivatePage( nullptr ); - bEnd = nRet; + bEnd = nRet != DeactivateRC::KeepPage; } return bEnd; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 5bb412c6a611..b13842995b7b 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -65,7 +65,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 1d3fae0f1cf5..6a7b367b28b1 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -283,7 +283,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); @@ -343,7 +343,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; void SetLanguage(LanguageType eSet); }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index d961504f5738..c6d7f7b54fff 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -64,7 +64,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index e96ab2caad4d..10e4a335c7c5 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -60,7 +60,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; void SetTableMode(); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index bfa100cf5753..07daa789476d 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -143,7 +143,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: virtual ~SvxCharNamePage(); @@ -230,7 +230,7 @@ public: virtual void dispose() override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -310,7 +310,7 @@ public: using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -358,7 +358,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index f7761c9f3d4d..41c9c325aeb9 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -59,7 +59,7 @@ private: void SetLinks (); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 22e265152b1b..adba0ba1a31b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -168,7 +168,7 @@ public: virtual void Reset(const SfxItemSet*) override; virtual void ChangesApplied() override; virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) override; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } @@ -290,7 +290,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ChangesApplied() override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; } @@ -358,7 +358,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; } @@ -441,7 +441,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; } void SetGradientList( XGradientListRef pGrdLst) @@ -523,7 +523,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; @@ -609,7 +609,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; @@ -743,7 +743,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index d51780e98fe1..19d00eb0baff 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -213,7 +213,7 @@ public: virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; @@ -312,7 +312,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } @@ -382,7 +382,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) 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 d2497117c405..98232373dc9e 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -114,7 +114,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) override; virtual void Reset( const SfxItemSet *rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet *pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet *pSet ) override; }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index b3cc61b147f9..942f97f4e9f2 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -130,7 +130,7 @@ public: virtual void Reset( const SfxItemSet& ) override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& rItemSet ) override; - virtual int DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; bool IsMarkWndVisible () { return static_cast<vcl::Window*>(mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index dafd1ab2ad78..eb58bb2d82c1 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -29,6 +29,7 @@ #include <vcl/button.hxx> #include <vcl/image.hxx> #include <vcl/layout.hxx> +#include <sfx2/tabdlg.hxx> #include <vector> // forward-declarations @@ -89,17 +90,8 @@ public: bool HasExchangeSupport() const { return bHasExchangeSupport; } void SetExchangeSupport() { bHasExchangeSupport = true; } - enum { - KEEP_PAGE = 0x0000, ///< error handling - /** 2nd filling of an ItemSet for updating superior examples; - this pointer can always be NULL!! */ - LEAVE_PAGE = 0x0001, - /// refresh set and update other pages - REFRESH_SET = 0x0002 - }; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ); const OUString& GetUserData() { return aUserString; } virtual bool QueryClose(); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index b94788e4ddfe..95f5c7cbe494 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -76,7 +76,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) 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 c5243bf15344..381345fd7a1b 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -109,7 +109,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; }; @@ -142,7 +142,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -186,7 +186,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -233,7 +233,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; }; @@ -344,7 +344,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -449,7 +449,7 @@ public: virtual void dispose() override; virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 67cd991bc662..abb31ee03f34 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -187,7 +187,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 6397f82083a3..a0e7dd812b90 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -95,7 +95,7 @@ private: DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: @@ -162,7 +162,7 @@ class SvxParaAlignTabPage : public SfxTabPage SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: virtual ~SvxParaAlignTabPage(); @@ -214,7 +214,7 @@ public: void DisablePageBreak(); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index d76725a8e46e..611ebc01003d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -134,7 +134,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void EnableAnchorTypes(sal_uInt16 nAnchorEnable); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index ed39b6e0405a..691533d46891 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -61,7 +61,7 @@ public: void DisableControls( const TabulatorDisableFlags nFlag ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index f56ee4eec014..b2e5157dac53 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -154,7 +154,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; @@ -212,7 +212,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; @@ -265,7 +265,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3085f6cf8336..8abba4e4f812 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1158,11 +1158,11 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) UpdateColorConfig(); } -SfxTabPage::sfxpg SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) +DeactivateRC SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxColorOptionsTabPage::UpdateColorConfig() diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index f66eab3f9b18..0963c14d6f67 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -56,7 +56,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void FillUserData() override; }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b05ca359003d..c8b07afff987 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -189,11 +189,11 @@ void OpenGLCfg::setForceOpenGL(bool bOpenGL) // class OfaMiscTabPage -------------------------------------------------- -SvxGeneralTabPage::sfxpg OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) +DeactivateRC OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } namespace diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index e3274d1b9f99..e6d99e67ad67 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -61,7 +61,7 @@ private: DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void ); DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index c2630b2c2a32..c6c59f7a0adc 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -416,11 +416,11 @@ void SvxGeneralTabPage::SetAddress_Impl() } -SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) +DeactivateRC SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 2b9d74453673..b52418d9d918 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -867,11 +867,11 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) { } -SfxTabPage::sfxpg SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } namespace diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 8f0e747e96f4..90a4eb58b56c 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -150,7 +150,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 0ca6699ed953..2f8e2fce7fd6 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -102,11 +102,11 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes m_pNfGraphicObjectCache->SetLast( long( double( nSizeInBytes ) * BYTES2NF ) ); } -SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 6415718c5c76..07031cb51914 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -52,7 +52,7 @@ private: inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index fc0333228ce3..ecdb26941977 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -685,8 +685,8 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) if ( RID_SVXPAGE_COLOR != pPageInfo->m_nPageId && pPageInfo->m_pPage->HasExchangeSupport() ) { - int nLeave = pPageInfo->m_pPage->DeactivatePage(pGroupInfo->m_pOutItemSet); - if ( nLeave == SfxTabPage::KEEP_PAGE ) + DeactivateRC nLeave = pPageInfo->m_pPage->DeactivatePage(pGroupInfo->m_pOutItemSet); + if ( nLeave == DeactivateRC::KeepPage ) { // the page mustn't be left pTreeLB->Select(pCurrentPageEntry); @@ -951,11 +951,11 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() { pOldPage = pOptPageInfo->m_pPage; OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pTreeLB->GetParent(pCurrentPageEntry)->GetUserData()); - int nLeave = SfxTabPage::LEAVE_PAGE; + DeactivateRC nLeave = DeactivateRC::LeavePage; if ( RID_SVXPAGE_COLOR != pOptPageInfo->m_nPageId && pOptPageInfo->m_pPage->HasExchangeSupport() ) nLeave = pOptPageInfo->m_pPage->DeactivatePage( pGroupInfo->m_pOutItemSet ); - if ( nLeave == SfxTabPage::KEEP_PAGE ) + if ( nLeave == DeactivateRC::KeepPage ) { // we cannot leave this page pBox->Select( pCurrentPageEntry ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 8b0e351495e2..71eae6f1771e 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -316,11 +316,11 @@ void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs ) UpdateEnableControls(); } -SfxTabPage::sfxpg AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 2922a9c6bbe4..9862579df881 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -945,9 +945,9 @@ void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -SfxTabPage::sfxpg OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) +DeactivateRC OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet* ) @@ -1464,9 +1464,9 @@ void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -SfxTabPage::sfxpg OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) +DeactivateRC OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index aa9c595d3eb2..e9d69c1a5366 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -919,15 +919,15 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s } /** virtual method; is called on deactivation */ -SfxTabPage::sfxpg SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( pPageImpl->bIsImportDlgInExecute ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT ) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 5ea3bdcae8f0..3c7c47903ad5 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -632,12 +632,12 @@ void SvxBorderTabPage::ChangesApplied() } -SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index d8cacd5d62a5..1fcff9728a45 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1202,11 +1202,11 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -1767,11 +1767,11 @@ IMPL_LINK_TYPED( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, } -SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -2865,11 +2865,11 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); } -SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -3402,11 +3402,11 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e7cd0def4c93..4161199f0046 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -403,11 +403,11 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcZoom(); } -SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } /*-------------------------------------------------------------------- diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f4aaa90393c0..21d8afec3794 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -815,11 +815,11 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } -SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index d4a7ad418ec0..2463ef33caf5 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -292,11 +292,11 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -SfxTabPage::sfxpg SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -456,11 +456,11 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -SfxTabPage::sfxpg SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) @@ -658,11 +658,11 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -SfxTabPage::sfxpg SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -900,11 +900,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -SfxTabPage::sfxpg SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -1362,11 +1362,11 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } -SfxTabPage::sfxpg SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) +DeactivateRC SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) @@ -3134,7 +3134,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) m_pPreviewWIN->Invalidate(); } -SfxTabPage::sfxpg SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) { @@ -3143,7 +3143,7 @@ SfxTabPage::sfxpg SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) DistanceHdl_Impl(*m_pIndentMF); FillItemSet(_pSet); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 93916879a442..da66d7c94bc1 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1423,7 +1423,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { // Inquiry whether the page margins are beyond the printing area. // If not, ask user whether they shall be taken. @@ -1449,7 +1449,7 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) if ( pField ) pField->GrabFocus(); UpdateExample_Impl(); - return KEEP_PAGE; + return DeactivateRC::KeepPage; } else CheckMarginEdits( false ); @@ -1471,7 +1471,7 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) _pSet->Put( SvxSizeItem( nWh, aSize ) ); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 295a39a1aebc..33bda89f5dd1 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -611,13 +611,13 @@ void SvxStdParagraphTabPage::EnableRelativeMode() bRelativeMode = true; } -SfxTabPage::sfxpg SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { ELRLoseFocusHdl( *m_pFLineIndent ); if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : @@ -1067,11 +1067,11 @@ void SvxParaAlignTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage::sfxpg SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) @@ -1844,11 +1844,11 @@ void SvxExtParagraphTabPage::ChangesApplied() m_pWidowRowNo->SetValue(m_pWidowRowNo->GetValue()); } -SfxTabPage::sfxpg SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxExtParagraphTabPage::DisablePageBreak() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 08cab4619451..6fcd7cc97238 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1089,11 +1089,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) } } -SfxTabPage::sfxpg SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 8de91ed094bb..a560129f044f 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -356,11 +356,11 @@ void SvxTabulatorTabPage::DisableControls(const TabulatorDisableFlags nFlag) m_pFillFrame->Disable(); } -SfxTabPage::sfxpg SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos ) diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index df35ae0f7df3..87155bc1a3fe 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -419,7 +419,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // area dialog { @@ -466,7 +466,7 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 093348abe57a..05d9b5470017 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -229,15 +229,15 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) } -SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) +DeactivateRC SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { if ( CheckChanges_Impl() == -1L ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8384d3e89a4d..93fbf9e6f678 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -505,15 +505,15 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) m_pBoxEmbed->Hide(); } -SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index f56afab9b365..8d87220bc32d 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -264,15 +264,15 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) } -SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( CheckChanges_Impl() == -1L ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 3b0afef74794..de983a7ac5d3 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -254,15 +254,15 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 240e9daa38ce..4c12af016a0e 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -678,7 +678,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // Line dialog { @@ -693,7 +693,7 @@ SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 3eab7dea9f19..52ea9ddf390b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -215,14 +215,14 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) } -SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 3364d3e9de9c..e2d039e41c88 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -179,14 +179,14 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) } -SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 1d9eddf343fd..b114f7444409 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -255,12 +255,12 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index e2f20b962cb2..5b936bd7bc7d 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -482,11 +482,11 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) InitPreview ( rSet ); } -SfxTabPage::sfxpg SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index cc7c3bfe3606..b570a604206e 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -333,14 +333,14 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) } -SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { FillItemSet(_pSet); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -703,14 +703,14 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { FillItemSet(_pSet); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -1158,7 +1158,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) { @@ -1174,7 +1174,7 @@ SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) FillItemSet(_pSet); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index c8de4cac85fc..3efb3bc15638 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -66,16 +66,16 @@ namespace dbaui SetExchangeSupport(); } - SfxTabPage::sfxpg OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) + DeactivateRC OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) { if (!prepareLeave()) - return KEEP_PAGE; + return DeactivateRC::KeepPage; FillItemSet(_pSet); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void OGenericAdministrationPage::Reset(const SfxItemSet* _rCoreAttrs) diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index a3f0232d5870..f674ffd0bcec 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -125,7 +125,7 @@ namespace dbaui protected: /// default implementation: call FillItemSet, call prepareLeave, - virtual sfxpg DeactivatePage(SfxItemSet* pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False virtual void Reset(const SfxItemSet* _rCoreAttrs) override; diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index d24a01e82c08..73296378467a 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -650,7 +650,7 @@ bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) resetPages(m_pImpl->getCurrentDataSource()); } SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState)); - return pPage && pPage->DeactivatePage(m_pOutSet) != 0; + return pPage && pPage->DeactivatePage(m_pOutSet) != DeactivateRC::LeavePage; } void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) @@ -659,9 +659,8 @@ void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) // why? } -void ODbTypeWizDialogSetup::enableConfirmSettings( bool _bEnable ) +void ODbTypeWizDialogSetup::enableConfirmSettings( bool /*_bEnable*/ ) { - (void)_bEnable; } namespace diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 127ea3a42460..9b682a64e143 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -384,9 +384,9 @@ namespace dbaui m_pTablesList->checkWildcard(m_pTablesList->getAllObjectsEntry()); } - SfxTabPage::sfxpg OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet) + DeactivateRC OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet) { - sfxpg nResult = OGenericAdministrationPage::DeactivatePage(_pSet); + DeactivateRC 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 6e1acc955d93..1ff3c602d763 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) override; - virtual sfxpg DeactivatePage(SfxItemSet* _pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* _pSet) override; using OGenericAdministrationPage::DeactivatePage; virtual void StateChanged( StateChangedType nStateChange ) override; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index f7a202eb837d..6003cd2ad8a7 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -511,7 +511,7 @@ protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); @@ -630,7 +630,7 @@ private: protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 67d0b4ebeb6b..5cb65acbc380 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -93,7 +93,7 @@ protected: using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage(SfxItemSet * = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet * = nullptr) override; public: SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 283c369f0de4..3d56b668aded 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -86,7 +86,7 @@ private: protected: using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 1b3b63c5e4d6..8325722893a5 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -30,6 +30,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <com/sun/star/frame/XFrame.hpp> +#include <o3tl/typed_flags_set.hxx> class SfxPoolItem; class SfxTabDialog; @@ -201,6 +202,18 @@ public: namespace sfx { class ItemConnectionBase; } +enum class DeactivateRC { + KeepPage = 0x00, // Error handling; page does not change + // 2. Fill an itemset for update + // parent examples, this pointer can be NULL all the time! + LeavePage = 0x01, + // Set, refresh and update other Page + RefreshSet = 0x02 +}; +namespace o3tl { + template<> struct typed_flags<DeactivateRC> : is_typed_flags<DeactivateRC, 0x03> {}; +} + class SFX2_DLLPUBLIC SfxTabPage: public TabPage { friend class SfxTabDialog; @@ -235,19 +248,10 @@ public: void SetExchangeSupport() { bHasExchangeSupport = true; } - enum sfxpg { - KEEP_PAGE = 0x0000, // Error handling; page does not change - // 2. Fill an itemset for update - // parent examples, this pointer can be NULL all the time! - LEAVE_PAGE = 0x0001, - // Set, refresh and update other Page - REFRESH_SET = 0x0002 - }; - using TabPage::ActivatePage; using TabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ); - virtual sfxpg DeactivatePage( SfxItemSet* pSet ); + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ); void SetUserData(const OUString& rString) { aUserString = rString; } const OUString& GetUserData() { return aUserString; } diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 7fa034968239..fd09aaa64af7 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 ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index af696eaf5da5..64d28a9a0334 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -110,7 +110,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: VclPtr<CheckBox> pCbxUseGridsnap; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index d7c0899792b0..1717a610a723 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -149,12 +149,12 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs ) return bAttrsChanged; } -SfxTabPage::sfxpg ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_TYPED( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index cafd3af373f1..02dc4a18b759 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -319,7 +319,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) } } -SfxTabPage::sfxpg ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) { if ( pDlg ) { @@ -333,7 +333,7 @@ SfxTabPage::sfxpg ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) if ( pSetP ) FillItemSet( pSetP ); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) @@ -783,7 +783,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) } } -SfxTabPage::sfxpg ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) { bool bPosInputOk = true; @@ -830,7 +830,7 @@ SfxTabPage::sfxpg ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( pSetP && bPosInputOk ) FillItemSet( pSetP ); - return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; + return bPosInputOk ? DeactivateRC::LeavePage : DeactivateRC::KeepPage; } void ScTabPageSortOptions::FillUserSortListBox() diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index d48d63228b86..b44699e1be4d 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -40,7 +40,7 @@ public: protected: using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; private: ScTabPageProtection( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 806035cab52d..bb35a16c07da 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; private: ScTpCalcOptions( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index d0842af95041..4c0c1f14aca0 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -24,7 +24,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override; virtual void Reset(const SfxItemSet* rCoreAttrs) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; virtual ~ScTpCompatOptions(); virtual void dispose() override; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 9fd14379ee94..9b5246953b05 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -24,7 +24,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset(const SfxItemSet* rCoreSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) 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 0b0ed6c51b0a..1a7e1ac42d92 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -39,7 +39,7 @@ public: virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) 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 49e1b8ac08bc..29692363059d 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -44,7 +44,7 @@ protected: virtual void ActivatePage() override; virtual void DeactivatePage() override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; private: VclPtr<PushButton> m_pBtnEdit; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 27b1334f6bc7..16b396a1bd30 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -38,7 +38,7 @@ public: virtual bool FillItemSet( SfxItemSet* rCoreSet ) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index f777f74e5666..c579c2b65d7e 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 ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr) override; private: OUString aStrUndefined; @@ -122,7 +122,7 @@ protected: virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr) override; private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index e6d0ba17870b..c8fc966d8e19 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -36,7 +36,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; virtual void DataChanged ( const DataChangedEvent& rDCEvt ) override; virtual ~ScTablePage(); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 93cdd3f74522..982646b0b09f 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -39,7 +39,7 @@ public: virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; virtual void Reset ( const SfxItemSet* rCoreAttrs ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet = nullptr ) override; private: ScTpUserLists( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 2af7b8f22d54..e415f110570c 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -78,7 +78,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; @@ -123,7 +123,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 74c1606b4d4a..9cf30a177009 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -190,18 +190,18 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) return false; } -SfxTabPage::sfxpg ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { - sfxpg nReturn = KEEP_PAGE; + DeactivateRC nReturn = DeactivateRC::KeepPage; double fEps; if( m_pEdEps->GetValue( fEps ) && (fEps > 0.0) ) { pLocalOptions->SetIterEps( fEps ); - nReturn = LEAVE_PAGE; + nReturn = DeactivateRC::LeavePage; } - if ( nReturn == KEEP_PAGE ) + if ( nReturn == DeactivateRC::KeepPage ) { ScopedVclPtr<MessageDialog>::Create( this, ScGlobal::GetRscString( STR_INVALID_EPS ) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 3c83b980b7aa..30c16b0b2ce3 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -75,9 +75,9 @@ void ScTpCompatOptions::Reset(const SfxItemSet *rCoreAttrs) m_pLbKeyBindings->SaveValue(); } -SfxTabPage::sfxpg ScTpCompatOptions::DeactivatePage(SfxItemSet* /*pSet*/) +DeactivateRC ScTpCompatOptions::DeactivatePage(SfxItemSet* /*pSet*/) { - return KEEP_PAGE; + return DeactivateRC::KeepPage; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index b854ae1f0f07..6236853c44b4 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -79,9 +79,9 @@ void ScTpDefaultsOptions::Reset(const SfxItemSet* rCoreSet) m_pEdSheetPrefix->SaveValue(); } -SfxTabPage::sfxpg ScTpDefaultsOptions::DeactivatePage(SfxItemSet* /*pSet*/) +DeactivateRC ScTpDefaultsOptions::DeactivatePage(SfxItemSet* /*pSet*/) { - return KEEP_PAGE; + return DeactivateRC::KeepPage; } void ScTpDefaultsOptions::CheckNumSheets() diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index afbf42160627..02fdef56e578 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -371,10 +371,10 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet) maCurrentDocOptions = maSavedDocOptions; } -SfxTabPage::sfxpg ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/) +DeactivateRC ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/) { // What's this method for ? - return KEEP_PAGE; + return DeactivateRC::KeepPage; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 6ee0b8945925..bb0b8830c6d9 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -57,12 +57,12 @@ VclPtr<SfxTabPage> ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItem return VclPtr<ScTpPrintOptions>::Create( pParent, *rAttrSet ); } -SfxTabPage::sfxpg ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index be45355014a7..aca56c1693c6 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -243,12 +243,12 @@ bool ScTpUserLists::FillItemSet( SfxItemSet* rCoreAttrs ) return bDataModified; } -SfxTabPage::sfxpg ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } size_t ScTpUserLists::UpdateUserListBox() diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 110cb3038c06..99b4fe7e9f85 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -235,11 +235,11 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) *pLocalOptions = static_cast<const ScTpViewItem*>(pItem)->GetViewOptions(); } -SfxTabPage::sfxpg ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(pSetP); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) @@ -671,11 +671,11 @@ void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) { } -SfxTabPage::sfxpg ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(pSetP); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void) diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index f69edd00c25a..20059109bd6a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -128,13 +128,13 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet ) SvxHFPage::ActivatePage( rSet ); } -SfxTabPage::sfxpg ScHFPage::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { - if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) + if ( DeactivateRC::LeavePage == SvxHFPage::DeactivatePage( pSetP ) ) if ( pSetP ) FillItemSet( pSetP ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScHFPage::ActivatePage() diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index f7eddeb31822..27eecb86d29f 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -341,12 +341,12 @@ bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet ) return bDataChanged; } -SfxTabPage::sfxpg ScTablePage::DeactivatePage( SfxItemSet* pSetP ) +DeactivateRC ScTablePage::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( pSetP ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 49393bd441d5..f78f184638e6 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -369,12 +369,12 @@ void SdTPAction::ActivatePage( const SfxItemSet& ) { } -SfxTabPage::sfxpg SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) +DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { if( pPageSet ) FillItemSet( pPageSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SdTPAction::Create( vcl::Window* pWindow, diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index df67367bcfdd..df55b9652ae7 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -363,7 +363,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) } } -SfxTabPage::sfxpg SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) +DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // check parser sal_Int32 nX, nY; @@ -371,17 +371,17 @@ SfxTabPage::sfxpg SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { if( pActiveSet ) FillItemSet( pActiveSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) ); if( aWarnBox->Execute() == RET_YES ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( pActiveSet ) FillItemSet( pActiveSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index ecc407fdf5fe..13e59a142a10 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -102,7 +102,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void Construct(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index d0b765c48494..e4edb5ef9f32 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -127,7 +127,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 594db9ff87dd..d694dee656a9 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -629,8 +629,8 @@ IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) if ( pImpl->m_pSfxPage->HasExchangeSupport() ) { - int nRet = pImpl->m_pSfxPage->DeactivatePage( GetOutputSetImpl() ); - if ( nRet != SfxTabPage::LEAVE_PAGE ) + DeactivateRC nRet = pImpl->m_pSfxPage->DeactivatePage( GetOutputSetImpl() ); + if ( nRet != DeactivateRC::LeavePage ) return; else bModified = ( GetOutputItemSet()->Count() > 0 ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 644a43cc871f..a2d999086d85 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2261,11 +2261,11 @@ void SfxCustomPropertiesPage::Reset( const SfxItemSet* rItemSet ) } } -SfxTabPage::sfxpg SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +DeactivateRC SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { - sfxpg nRet = LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( !m_pPropertiesCtrl->AreAllLinesValid() ) - nRet = KEEP_PAGE; + nRet = DeactivateRC::KeepPage; return nRet; } @@ -2760,9 +2760,9 @@ void SfxCmisPropertiesPage::Reset( const SfxItemSet* rItemSet ) m_pPropertiesCtrl.setScrollRange(); } -SfxTabPage::sfxpg SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +DeactivateRC SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3290ae18bddf..fb99cd388d5e 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -589,7 +589,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) } -SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) +DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] @@ -606,7 +606,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet */ { - sfxpg nRet = SfxTabPage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( m_pNameRw->IsModified() ) { @@ -620,7 +620,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet aBox->Execute(); m_pNameRw->GrabFocus(); m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; } @@ -636,7 +636,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ScopedVclPtrInstance< MessageDialog > aBox(this, SfxResId( STR_TABPAGE_INVALIDSTYLE ), VclMessageType::Info); aBox->Execute(); m_pFollowLb->GrabFocus(); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; } @@ -656,10 +656,10 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ScopedVclPtrInstance< MessageDialog > aBox(this, SfxResId( STR_TABPAGE_INVALIDPARENT ), VclMessageType::Info); aBox->Execute(); m_pBaseLb->GrabFocus(); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; - nRet = sfxpg(nRet | SfxTabPage::REFRESH_SET); + nRet = nRet | DeactivateRC::RefreshSet; } } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index fd42d4a80e02..0b72c3478f14 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -185,12 +185,12 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet* /*rSet*/ ) ImplUpdateControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); } -SfxTabPage::sfxpg SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) +DeactivateRC SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) { if( pItemSet ) FillItemSet( pItemSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCurrentOptions ) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index f2cac5859b15..879fcd9ebdb9 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -93,7 +93,7 @@ void SfxStyleDialog::RefreshInputSet() /* [Description] This is called when <SfxTabPage::DeactivatePage(SfxItemSet *)> - returns <SfxTabPage::REFRESH_SET>. + returns <DeactivateRC::RefreshSet>. */ { diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 3d88b4937d7f..55621bef6955 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -199,7 +199,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& ) { } -SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) +DeactivateRC SfxTabPage::DeactivatePage( SfxItemSet* ) /* [Description] @@ -213,11 +213,11 @@ SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) [Return value] - LEAVE_PAGE; Allow leaving the page + DeactivateRC::LeavePage; Allow leaving the page */ { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } @@ -827,7 +827,7 @@ void SfxTabDialog::RefreshInputSet() Default implementation of the virtual Method. This is called, when <SfxTabPage::DeactivatePage(SfxItemSet *)> - returns <SfxTabPage::REFRESH_SET>. + returns <DeactivateRC::RefreshSet>. */ { @@ -841,7 +841,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) Handler of the Ok-Buttons This calls the current page <SfxTabPage::DeactivatePage(SfxItemSet *)>. - Returns <SfxTabPage::LEAVE_PAGE>, <SfxTabDialog::Ok()> is called + Returns <DeactivateRC::LeavePage>, <SfxTabDialog::Ok()> is called and the Dialog is ended. */ @@ -886,7 +886,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() if ( pPage ) { - int nRet = SfxTabPage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( m_pSet ) { SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() ); @@ -896,7 +896,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() else nRet = pPage->DeactivatePage( nullptr ); - if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE + if ( ( DeactivateRC::LeavePage & nRet ) == DeactivateRC::LeavePage && aTmp.Count() ) { m_pExampleSet->Put( aTmp ); @@ -905,7 +905,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } else nRet = pPage->DeactivatePage( nullptr ); - bEnd = nRet; + bEnd = nRet != DeactivateRC::KeepPage; } return bEnd; @@ -918,7 +918,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) Handler of the User-Buttons This calls the current page <SfxTabPage::DeactivatePage(SfxItemSet *)>. - returns this <SfxTabPage::LEAVE_PAGE> and <SfxTabDialog::Ok()> is called. + returns this <DeactivateRC::LeavePage> and <SfxTabDialog::Ok()> is called. Then the Dialog is ended with the Return value <SfxTabDialog::Ok()> */ @@ -1153,7 +1153,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) DBG_ASSERT( pDataObject, "no Data structure for current page" ); #endif - int nRet = SfxTabPage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( !m_pExampleSet && pPage->HasExchangeSupport() && m_pSet ) m_pExampleSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() ); @@ -1166,7 +1166,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) nRet = pPage->DeactivatePage( &aTmp ); else nRet = pPage->DeactivatePage( nullptr ); - if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE && + if ( ( DeactivateRC::LeavePage & nRet ) == DeactivateRC::LeavePage && aTmp.Count() ) { m_pExampleSet->Put( aTmp ); @@ -1189,7 +1189,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) nRet = pPage->DeactivatePage( nullptr ); } - if ( nRet & SfxTabPage::REFRESH_SET ) + if ( nRet & DeactivateRC::RefreshSet ) { RefreshInputSet(); // Flag all Pages as to be initialized as new @@ -1204,7 +1204,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) pObj->bRefresh = false; } } - if ( nRet & SfxTabPage::LEAVE_PAGE ) + if ( nRet & DeactivateRC::LeavePage ) return true; else return false; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 1096ea891ce5..e1f367beb5a9 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -1044,11 +1044,11 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) RangeHdl(); } -SfxTabPage::sfxpg SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_NOARG_TYPED(SvxHFPage, RangeFocusHdl, Control&, void) diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 848949e8e9d1..36111159cd17 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -302,11 +302,11 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_TYPED( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 31fc121f6ebd..725c69b8e0d0 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -610,12 +610,12 @@ void SwDropCapsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage::sfxpg SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) +DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) { if (_pSet) FillSet(*_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SwDropCapsPage::Create(vcl::Window *pParent, diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index a3d24473ad8b..30449f073e7c 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -145,12 +145,12 @@ void SwCondCollPage::dispose() SfxTabPage::dispose(); } -SfxTabPage::sfxpg SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) +DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index d7cccbf14e8e..55e762c1dfbb 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -473,11 +473,11 @@ void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -SfxTabPage::sfxpg SwEnvFormatPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwEnvFormatPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet(_pSet); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwEnvFormatPage::FillItem(SwEnvItem& rItem) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 51a98ae6c716..ef2226613fca 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -65,7 +65,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 4aeb134907c4..41efae3a3dbd 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -328,12 +328,12 @@ void SwEnvPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -SfxTabPage::sfxpg SwEnvPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); if( _pSet ) FillItemSet(_pSet); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwEnvPage::FillItem(SwEnvItem& rItem) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 2b8516d0c425..5ff8a10eeef6 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -151,11 +151,11 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet&) m_pPrinterInfo->SetText(pPrt->GetName()); } -SfxTabPage::sfxpg SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet(_pSet); - return SfxTabPage::LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwEnvPrtPage::FillItem(SwEnvItem& rItem) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index d68991d311e8..6f76a48b8d20 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -64,7 +64,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 66bf387b26f3..d7d67aa0da57 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -488,12 +488,12 @@ void SwLabPage::ActivatePage(const SfxItemSet& rSet) Reset( &rSet ); } -SfxTabPage::sfxpg SwLabPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwLabPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwLabPage::FillItem(SwLabItem& rItem) @@ -634,11 +634,11 @@ void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) UpdateFields(); } -SfxTabPage::sfxpg SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet) @@ -795,11 +795,11 @@ void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) Reset(&rSet); } -SfxTabPage::sfxpg SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet) @@ -908,11 +908,11 @@ void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) Reset(&rSet); } -SfxTabPage::sfxpg SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index b1aa3308bada..8a889e042106 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -495,12 +495,12 @@ void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet) Reset(&aSet); } -SfxTabPage::sfxpg SwLabFormatPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwLabFormatPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwLabFormatPage::FillItem(SwLabItem& rItem) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 2e87bbd76c98..1e3a63f5df0b 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -105,7 +105,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index d5a95de387ca..64b75d0d9a41 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -116,12 +116,12 @@ void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) Reset(&rSet); } -SfxTabPage::sfxpg SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) { if ( _pSet ) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwLabPrtPage::FillItem(SwLabItem& rItem) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index d7dbc5b78b93..fa4454bc7c1a 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -59,7 +59,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 896502cdccfb..14f817a0880f 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -69,7 +69,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -121,7 +121,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; @@ -160,7 +160,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; @@ -197,7 +197,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index ebed2f3fe5ee..5f9737aed922 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1329,12 +1329,12 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet) Update(nullptr); } -SfxTabPage::sfxpg SwColumnPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_TYPED( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index ecd238d24af7..ac5956ff4184 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1736,7 +1736,7 @@ void SwFramePage::ActivatePage(const SfxItemSet& rSet) m_pFollowTextFlowCB->SaveValue(); } -SfxTabPage::sfxpg SwFramePage::DeactivatePage(SfxItemSet * _pSet) +DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet) { if ( _pSet ) { @@ -1751,7 +1751,7 @@ SfxTabPage::sfxpg SwFramePage::DeactivatePage(SfxItemSet * _pSet) _pSet->Put( aAnc ); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } // swap left/right with inside/outside @@ -2554,11 +2554,11 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet ) return bModified; } -SfxTabPage::sfxpg SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) { if( _pSet ) FillItemSet( _pSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 533c7b1e4888..7d0fe614f921 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -578,12 +578,12 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) ContourHdl(nullptr); } -SfxTabPage::sfxpg SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) +DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } // range check diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 95e6a97b53d0..d8383ce90a3c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1302,13 +1302,13 @@ void SwTOXSelectTabPage::ActivatePage( const SfxItemSet& ) //nothing to do } -SfxTabPage::sfxpg SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) _pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE, (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectEntryData()))); FillTOXDescription(); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) @@ -2212,10 +2212,10 @@ void SwTOXEntryTabPage::UpdateDescriptor() pCurrentForm->SetCommaSeparated(m_pCommaSeparatedCB->IsChecked()); } -SfxTabPage::sfxpg SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) +DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) { UpdateDescriptor(); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) @@ -3721,10 +3721,10 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) EnableSelectHdl(*m_pParaLayLB); } -SfxTabPage::sfxpg SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { GetForm() = *m_pCurrentForm; - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 50db6dc257f5..3cbe02204b8d 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -431,12 +431,12 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) m_pPreviewWIN->Invalidate(); } -SfxTabPage::sfxpg SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +DeactivateRC SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c676566e2e2d..4bc1439f9680 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -832,10 +832,10 @@ void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& ) LevelHdl(*m_pLevelLB); } -SfxTabPage::sfxpg SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) +DeactivateRC SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) { SwOutlineTabDialog::SetActNumLevel(nActLevel); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 2ab8e3cd5b83..88cd797ffd7f 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -358,12 +358,12 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) HeightModify(*m_pMaxHeightEdit); } -SfxTabPage::sfxpg SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) +DeactivateRC SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) { if(_pSet) FillItemSet(_pSet); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 1ce914db8290..3614c8899bad 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -267,9 +267,9 @@ void SwTextGridPage::ActivatePage( const SfxItemSet& rSet ) m_pExampleWN->Invalidate(); } -SfxTabPage::sfxpg SwTextGridPage::DeactivatePage( SfxItemSet* ) +DeactivateRC SwTextGridPage::DeactivatePage( SfxItemSet* ) { - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void SwTextGridPage::PutGridItem(SfxItemSet& rSet) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index ff04a0f6e637..139712ad4946 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -619,7 +619,7 @@ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) } -SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) { //os: VCL doesn't take care of making the active widget //in the dialog lose the focus @@ -630,7 +630,7 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) { ScopedVclPtrInstance<MessageDialog>::Create(this, SW_RES(STR_WRONG_TABLENAME), VclMessageType::Info)->Execute(); m_pNameED->GrabFocus(); - return KEEP_PAGE; + return DeactivateRC::KeepPage; } if(_pSet) { @@ -730,7 +730,7 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) _pSet->Put(SwPtrItem(FN_TABLE_REP, pTableData)); } } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } //Description: Page column configuration @@ -1136,7 +1136,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) } -SfxTabPage::sfxpg SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) +DeactivateRC SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -1195,7 +1195,7 @@ SfxTabPage::sfxpg SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) } _pSet->Put(SwPtrItem( FN_TABLE_REP, pTableData )); } - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } SwTwips SwTableColumnPage::GetVisibleWidth(sal_uInt16 nPos) diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 85664d41b9b5..22b1e312c18d 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -158,7 +158,7 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::DeactivatePage; virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; void connectPercentField(PercentField &rWrap, const OString &rName); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 66c4ae24c853..fa1aec6d2b07 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -66,7 +66,7 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); DECL_LINK_TYPED( ClickHdl, Button*, void ); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index ca2e7a1ae400..6c9be69b14d2 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -109,7 +109,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pSet = nullptr) override; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 74ab40d760f1..225a9220a7d3 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -128,7 +128,7 @@ class SwFramePage: public SfxTabPage bool m_bIsMathBaselineAlignment; virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); @@ -240,7 +240,7 @@ public: virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; }; class SwFrameURLPage : public SfxTabPage diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index c0b0ac00ff33..2fb2d59e24bd 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -113,7 +113,7 @@ public: virtual void dispose() override; virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index eff809095055..7549428d86a2 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -127,7 +127,7 @@ public: void SetWrtShell(SwWrtShell* pShell); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index fcb35a1a4eb4..1b8bc1183e9d 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -69,7 +69,7 @@ private: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index d57c3f2bd5a0..df3fda8f8087 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -95,7 +95,7 @@ public: virtual void Reset(const SfxItemSet *rSet) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; #endif diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 0dbbce3a3c17..c467c27a17c1 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -50,7 +50,7 @@ class SwCondCollPage : public SfxTabPage virtual ~SwCondCollPage(); virtual void dispose() override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; DECL_LINK_TYPED( OnOffHdl, Button*, void ); DECL_LINK_TYPED( AssignRemoveHdl, ListBox&, void); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index eda9017bd5ab..38ffb0302e7b 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -228,7 +228,7 @@ public: virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -443,7 +443,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -491,7 +491,7 @@ public: virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; static VclPtr<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 940941870536..7bab5fc892c3 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -82,7 +82,7 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; DECL_LINK_TYPED( RangeModifyHdl, SpinField&, void ); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 75d1e76a5a38..3fddccba05f8 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -88,7 +88,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; // TabPage Format/Table/Columns @@ -139,7 +139,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override; }; |