mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert DeactivePage return code to scoped enum

Browse Source 
Change-Id: Idd5372ad20fc6676864b31b3796f8b9bc0ad73dd
Reviewed-on: https://gerrit.libreoffice.org/25918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-06-05 15:15:56 +02:00
parent 7d1b01070c
commit 11b4a6ddce
136 changed files with 339 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chart2/source/controller/dialogs/tp_AxisPositions.cxx
View File

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

2
chart2/source/controller/dialogs/tp_AxisPositions.hxx
View File

@ -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 );

8
chart2/source/controller/dialogs/tp_Scale.cxx
View File

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

2
chart2/source/controller/dialogs/tp_Scale.hxx
View File

@ -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();

4
cui/source/dialogs/hltpbase.cxx
View File

@ -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()

16
cui/source/dialogs/iconcdlg.cxx
View File

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

2
cui/source/inc/align.hxx
View File

@ -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:

4
cui/source/inc/autocdlg.hxx
View File

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

2
cui/source/inc/backgrnd.hxx
View File

@ -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 );

2
cui/source/inc/border.hxx
View File

@ -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:

8
cui/source/inc/chardlg.hxx
View File

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

2
cui/source/inc/cuioptgenrl.hxx
View File

@ -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 );

14
cui/source/inc/cuitabarea.hxx
View File

@ -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 );

6
cui/source/inc/cuitabline.hxx
View File

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

2
cui/source/inc/grfpage.hxx
View File

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

2
cui/source/inc/hltpbase.hxx
View File

@ -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() ); }

12
cui/source/inc/iconcdlg.hxx
View File

@ -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();

2
cui/source/inc/numfmt.hxx
View File

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

12
cui/source/inc/numpages.hxx
View File

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

2
cui/source/inc/page.hxx
View File

@ -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 );

6
cui/source/inc/paragrph.hxx
View File

@ -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 );

2
cui/source/inc/swpossizetabpage.hxx
View File

@ -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);

2
cui/source/inc/tabstpge.hxx
View File

@ -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 );

6
cui/source/inc/transfrm.hxx
View File

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

4
cui/source/options/optcolor.cxx
View File

@ -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()

2
cui/source/options/optcolor.hxx
View File

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

4
cui/source/options/optgdlg.cxx
View File

@ -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

2
cui/source/options/optgdlg.hxx
View File

@ -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 );

4
cui/source/options/optgenrl.cxx
View File

@ -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: */

4
cui/source/options/optinet2.cxx
View File

@ -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

2
cui/source/options/optinet2.hxx
View File

@ -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 );

4
cui/source/options/optmemory.cxx
View File

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

2
cui/source/options/optmemory.hxx
View File

@ -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 );

8
cui/source/options/treeopt.cxx
View File

@ -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 );

4
cui/source/tabpages/align.cxx
View File

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

8
cui/source/tabpages/autocdlg.cxx
View File

@ -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* )

6
cui/source/tabpages/backgrnd.cxx
View File

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

4
cui/source/tabpages/border.cxx
View File

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

16
cui/source/tabpages/chardlg.cxx
View File

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

4
cui/source/tabpages/grfpage.cxx
View File

@ -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;
}
/*--------------------------------------------------------------------

4
cui/source/tabpages/numfmt.cxx
View File

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

24
cui/source/tabpages/numpages.cxx
View File

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

6
cui/source/tabpages/page.cxx
View File

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

12
cui/source/tabpages/paragrph.cxx
View File

@ -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()

4
cui/source/tabpages/swpossizetabpage.cxx
View File

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

4
cui/source/tabpages/tabstpge.cxx
View File

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

4
cui/source/tabpages/tparea.cxx
View File

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

6
cui/source/tabpages/tpbitmap.cxx
View File

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

6
cui/source/tabpages/tpcolor.cxx
View File

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

6
cui/source/tabpages/tpgradnt.cxx
View File

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

6
cui/source/tabpages/tphatch.cxx
View File

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

4
cui/source/tabpages/tpline.cxx
View File

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

4
cui/source/tabpages/tplnedef.cxx
View File

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

4
cui/source/tabpages/tplneend.cxx
View File

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

4
cui/source/tabpages/tpshadow.cxx
View File

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

4
cui/source/tabpages/tptrans.cxx
View File

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

12
cui/source/tabpages/transfrm.cxx
View File

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

6
dbaccess/source/ui/dlg/adminpages.cxx
View File

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

2
dbaccess/source/ui/dlg/adminpages.hxx
View File

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

5
dbaccess/source/ui/dlg/dbwizsetup.cxx
View File

@ -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

4
dbaccess/source/ui/dlg/tablespage.cxx
View File

@ -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

2
dbaccess/source/ui/dlg/tablespage.hxx
View File

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

4
include/sfx2/dinfdlg.hxx
View File

@ -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& );

2
include/sfx2/mgetempl.hxx
View File

@ -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 );

2
include/sfx2/printopt.hxx
View File

@ -86,7 +86,7 @@ private:
protected:
using TabPage::DeactivatePage;
virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:

24
include/sfx2/tabdlg.hxx
View File

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

2
include/svx/hdft.hxx
View File

@ -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 );

2
include/svx/optgrid.hxx
View File

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

4
sc/source/ui/attrdlg/tabpages.cxx
View File

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

8
sc/source/ui/dbgui/tpsort.cxx
View File

@ -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()

2
sc/source/ui/inc/tabpages.hxx
View File

@ -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,

2
sc/source/ui/inc/tpcalc.hxx
View File

@ -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,

2
sc/source/ui/inc/tpcompatibility.hxx
View File

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

2
sc/source/ui/inc/tpdefaults.hxx
View File

@ -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);

2
sc/source/ui/inc/tpformula.hxx
View File

@ -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);

2
sc/source/ui/inc/tphf.hxx
View File

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

2
sc/source/ui/inc/tpprint.hxx
View File

@ -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

4
sc/source/ui/inc/tpsort.hxx
View File

@ -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:

2
sc/source/ui/inc/tptable.hxx
View File

@ -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();

2
sc/source/ui/inc/tpusrlst.hxx
View File

@ -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,

4
sc/source/ui/inc/tpview.hxx
View File

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

8
sc/source/ui/optdlg/tpcalc.cxx
View File

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

4
sc/source/ui/optdlg/tpcompatibility.cxx
View File

@ -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: */

4
sc/source/ui/optdlg/tpdefaults.cxx
View File

@ -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()

4
sc/source/ui/optdlg/tpformula.cxx
View File

@ -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: */

4
sc/source/ui/optdlg/tpprint.cxx
View File

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

4
sc/source/ui/optdlg/tpusrlst.cxx
View File

@ -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()

8
sc/source/ui/optdlg/tpview.cxx
View File

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

6
sc/source/ui/pagedlg/tphf.cxx
View File

@ -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()

4
sc/source/ui/pagedlg/tptable.cxx
View File

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

4
sd/source/ui/dlg/tpaction.cxx
View File

@ -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,

8
sd/source/ui/dlg/tpoption.cxx
View File

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

2
sd/source/ui/inc/tpaction.hxx
View File

@ -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();

2
sd/source/ui/inc/tpoption.hxx
View File

@ -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 );

4
sfx2/source/dialog/basedlgs.cxx
View File

@ -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 );

10
sfx2/source/dialog/dinfdlg.cxx
View File

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

12
sfx2/source/dialog/mgetempl.cxx
View File

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

4
sfx2/source/dialog/printopt.cxx
View File

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

2
sfx2/source/dialog/styledlg.cxx
View File

@ -93,7 +93,7 @@ void SfxStyleDialog::RefreshInputSet()
/* [Description]
This is called when <SfxTabPage::DeactivatePage(SfxItemSet *)>
returns <SfxTabPage::REFRESH_SET>.
returns <DeactivateRC::RefreshSet>.
*/
{

26
sfx2/source/dialog/tabdlg.cxx
View File

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

Some files were not shown because too many files have changed in this diff Show More