summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx4
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx8
-rw-r--r--sc/source/ui/inc/tabpages.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx2
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx2
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx2
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/tphf.hxx2
-rw-r--r--sc/source/ui/inc/tpprint.hxx2
-rw-r--r--sc/source/ui/inc/tpsort.hxx4
-rw-r--r--sc/source/ui/inc/tptable.hxx2
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx2
-rw-r--r--sc/source/ui/inc/tpview.hxx4
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx8
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx4
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx4
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx4
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx4
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx4
-rw-r--r--sc/source/ui/optdlg/tpview.cxx8
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx6
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx4
22 files changed, 42 insertions, 42 deletions
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 )
generated by cgit (git 2.34.1) at 2025-01-06 09:14:34 +0000