diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-26 15:34:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-27 13:45:09 +0200 |
commit | 34002c4e5cf68ac0c98c3922c653c9ea8b898207 (patch) | |
tree | a1a87e45a968cee95e8db7d2f5704070a04b2934 /sc/source/ui | |
parent | ffca95023020a24eaff4ece1d4c7bedd469bfb78 (diff) |
sfx2: sal_Bool->bool
Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14
Diffstat (limited to 'sc/source/ui')
33 files changed, 56 insertions, 56 deletions
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 5e3e436460b2..9931208e1943 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -122,7 +122,7 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) -sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bAttrsChanged = false; sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index bfe7af6abbfe..20c4609a3948 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -238,7 +238,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -299,7 +299,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); - return sal_True; + return true; } @@ -720,7 +720,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { // Create local copy of ScParam ScSortParam aNewSortData = aSortData; @@ -764,7 +764,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); - return sal_True; + return true; } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 85dc33b36069..3958ee6e287f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -446,9 +446,9 @@ void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) -sal_Bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } -sal_Bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } -sal_Bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } +bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } +bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } +bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } #undef FILL @@ -541,7 +541,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index b2d7c2c40602..bcac2499a434 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -412,7 +412,7 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) CheckHdl( NULL ); } -sal_Bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) { sal_Int16 nListType = maCbShow.IsChecked() ? (maCbSort.IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) : @@ -426,7 +426,7 @@ sal_Bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, maCbAllow.IsChecked() ) ); rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); - return sal_True; + return true; } OUString ScTPValidationValue::GetFirstFormula() const @@ -745,13 +745,13 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) -sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) ); - return sal_True; + return true; } @@ -841,14 +841,14 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) -sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); - return sal_True; + return true; } diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 0117dc47991a..de9afa62bd45 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -70,7 +70,7 @@ ScDocStatPage::~ScDocStatPage() -sal_Bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) { return false; } diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 39d8564dcc4c..4ed20bac04c2 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -51,7 +51,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx index fd02f59b7423..ef85e37c17c4 100644 --- a/sc/source/ui/inc/optload.hxx +++ b/sc/source/ui/inc/optload.hxx @@ -49,7 +49,7 @@ public: void SetDocument(ScDocument*); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index bf1b3aac6dc4..4e8e4b01b06b 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -47,7 +47,7 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); void SetNumType(SvxNumType eNumType); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 08ce230f2bc4..7dd495b7e07a 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -32,7 +32,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); virtual void Reset ( const SfxItemSet& ); protected: diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 886dde6bac05..155676f1c741 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -37,7 +37,7 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 01d74f432307..95478abb662c 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreAttrs); + virtual bool FillItemSet(SfxItemSet& rCoreAttrs); virtual void Reset(const SfxItemSet& rCoreAttrs); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index dce6fc18652f..296105f97064 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreSet); + virtual bool FillItemSet(SfxItemSet& rCoreSet); virtual void Reset(const SfxItemSet& rCoreSet); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index acd554fb1087..888870a7cf2e 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreSet); + virtual bool FillItemSet(SfxItemSet& rCoreSet); virtual void Reset( const SfxItemSet& rCoreSet ); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index d87eb644df49..798e4c007b5e 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -32,7 +32,7 @@ public: virtual ~ScHFPage(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); + virtual bool FillItemSet( SfxItemSet& rOutSet ); void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index ca9a42fc536f..6b8c013c1b43 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -36,7 +36,7 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rCoreSet ); + virtual bool FillItemSet( SfxItemSet& rCoreSet ); virtual void Reset( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index ec3ed8c67629..58d483e2a189 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -56,7 +56,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation); @@ -118,7 +118,7 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); protected: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 50b83e56e115..781f79ca6e3d 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -39,7 +39,7 @@ private: ~ScDocStatPage(); protected: - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset ( const SfxItemSet& rSet ); private: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 66f56af770c9..bfe60d0031df 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -90,7 +90,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -107,7 +107,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -124,7 +124,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -141,7 +141,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index bb064000a5e2..ba00be991832 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -30,8 +30,8 @@ class ScTablePage : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + static sal_uInt16* GetRanges (); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 03308ea8bd64..eb4a15b92b6b 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -37,7 +37,7 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); virtual void Reset ( const SfxItemSet& rCoreAttrs ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 547864673588..08cb22c161a7 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -75,7 +75,7 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -125,7 +125,7 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9bc029af93ed..9d360ab054e3 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -188,7 +188,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rArgSet ); + virtual bool FillItemSet( SfxItemSet& rArgSet ); virtual void Reset( const SfxItemSet& rArgSet ); private: @@ -279,7 +279,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -307,7 +307,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 9eff711bf39d..8e7459cac8a3 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -72,7 +72,7 @@ SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new ScRedlineOptionsTabPage( pParent, rSet ); } -sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) { ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 5c3a4d6363e5..55db49230b47 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -148,7 +148,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) -sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert pLocalOptions->SetIterCount( (sal_uInt16)m_pEdSteps->GetValue() ); @@ -167,7 +167,7 @@ sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) if ( *pLocalOptions != *pOldOptions ) { rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); - return sal_True; + return true; } else return false; diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 3aa1b602ef0c..93d75aa91dde 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -30,7 +30,7 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt return new ScTpCompatOptions(pParent, rCoreAttrs); } -sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) +bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) { bool bRet = false; if (m_pLbKeyBindings->GetSavedValue() != m_pLbKeyBindings->GetSelectEntryPos()) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 1d91d5c00e21..ef0719934c77 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -39,7 +39,7 @@ SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet &rCore return new ScTpDefaultsOptions(pParent, rCoreAttrs); } -sal_Bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) +bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) { sal_Bool bRet = false; ScDefaultsOptions aOpt; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index ad198d008bd0..9c7f8dc552b5 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -227,7 +227,7 @@ SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreS return new ScTpFormulaOptions(pParent, rCoreSet); } -sal_Bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) +bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) { bool bRet = false; ScFormulaOptions aOpt; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index dc78e8ed7292..c2108ab6cd2f 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -94,7 +94,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) -sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); @@ -113,7 +113,7 @@ sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); } - return sal_True; + return true; } else { diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 79d6b32ac35d..5eab46a9811b 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -207,7 +207,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) -sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index fb055871dbf5..a1edc469210e 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -113,7 +113,7 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, return new ScTpContentOptions(pParent, rCoreSet); } -sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { sal_Bool bRet = false; if( pFormulaCB ->GetSavedValue() != TriState(pFormulaCB ->IsChecked()) || @@ -432,7 +432,7 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, return pNew; } -sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { sal_Bool bRet = sal_True; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 0f5c3002e019..cc42477cdc0a 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -187,7 +187,7 @@ void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) } } -sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = m_pWndLeft->CreateTextObject(); @@ -203,7 +203,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) rCoreSet.Put( aItem ); - return sal_True; + return true; } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 203102c1e4d6..a50a731d88aa 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -102,7 +102,7 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) -sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet ); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 034d27bcfe6c..581d23719196 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -231,7 +231,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) m_pEdScalePageNum->SaveValue(); } -sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); |