diff options
Diffstat (limited to 'sc/source')
32 files changed, 117 insertions, 117 deletions
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 71a30d40315c..d03198ad899c 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -116,11 +116,11 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } -bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = false; sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); - const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION ); + const SfxPoolItem* pOldItem = GetOldItem( *rCoreAttrs, SID_SCATTR_PROTECTION ); const SfxItemSet& rOldSet = GetItemSet(); SfxItemState eItemState = rOldSet.GetItemState( nWhich, false ); ScProtectionAttr aProtAttr; @@ -139,9 +139,9 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) } if ( bAttrsChanged ) - rCoreAttrs.Put( aProtAttr ); + rCoreAttrs->Put( aProtAttr ); else if ( eItemState == SFX_ITEM_DEFAULT ) - rCoreAttrs.ClearItem( nWhich ); + rCoreAttrs->ClearItem( nWhich ); return bAttrsChanged; } @@ -149,7 +149,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index a9a793c2e238..d87aa1a81185 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -224,7 +224,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) SetLastSortKey( nSortKeyCount ); } -bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -283,7 +283,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) aNewSortData.maKeyState[i].bDoSort = false; } - rArgSet.Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); + rArgSet->Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); return true; } @@ -324,7 +324,7 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) } if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return SfxTabPage::LEAVE_PAGE; } @@ -688,7 +688,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) } } -bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) { // Create local copy of ScParam ScSortParam aNewSortData = aSortData; @@ -730,7 +730,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) } aNewSortData.aCollatorAlgorithm = sAlg; - rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); + rArgSet->Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); return true; } @@ -806,7 +806,7 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) } if ( pSetP && bPosInputOk ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d2c53569f760..d76bc51992a2 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -413,10 +413,10 @@ void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); } void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #undef RESET -#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) -bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } -bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } -bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } +#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), *rArgSet )) +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 @@ -499,7 +499,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) CheckHdl( pBtnSort ); } -bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); @@ -522,7 +522,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) ? pLbUserDef->GetSelectEntryPos() : 0; - rArgSet.Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); + rArgSet->Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); return true; } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index df23c4b4a15f..19708bff48b7 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -428,20 +428,20 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) CheckHdl( NULL ); } -bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet ) { sal_Int16 nListType = m_pCbShow->IsChecked() ? (m_pCbSort->IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) : ValidListType::INVISIBLE; - rArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>( + rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>( lclGetValModeFromPos( m_pLbAllow->GetSelectEntryPos() ) ) ) ); - rArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>( + rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>( lclGetCondModeFromPos( m_pLbValue->GetSelectEntryPos() ) ) ) ); - rArgSet.Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) ); - rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); - rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) ); - rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); + rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) ); + rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); + rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) ); + rArgSet->Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); return true; } @@ -697,11 +697,11 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) pEdInputHelp->SetText( EMPTY_OUSTRING ); } -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() ) ); + 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 true; } @@ -774,12 +774,12 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) SelectActionHdl( NULL ); } -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() ) ); + 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 true; } diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index d1dbac731dc3..1602531b7b36 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -60,7 +60,7 @@ ScDocStatPage::~ScDocStatPage() { } -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 fda8522e9ea8..04da009d50cb 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f74eaff36945..758915aa2d15 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -46,7 +46,7 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; void SetNumType(SvxNumType eNumType); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index e5780f45d807..eed164d10da4 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -30,7 +30,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& ) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index abb50f013807..fbc56eaf8159 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -35,7 +35,7 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 12114289ee7d..f4ed342c43ef 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 bool FillItemSet(SfxItemSet& rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 68b6e2c01137..7122263428d5 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 bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rCoreSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index de7c1e45d92c..15352a5b6fce 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 bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 2f4fff087ac8..1061e4139128 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -30,7 +30,7 @@ public: virtual ~ScHFPage(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; 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 fe93a048f19c..24ca945c5c35 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -34,7 +34,7 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 256ec321056a..f654a88e4509 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -54,7 +54,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 4cd4d4aa1ac8..6b2c18fd0fcb 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -37,7 +37,7 @@ private: virtual ~ScDocStatPage(); protected: - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rSet ) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 008bfe7bc59f..f6d48d5b5d03 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -84,7 +84,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -114,7 +114,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -129,7 +129,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index c04c3be2ba14..9ea189edd6fb 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -31,7 +31,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); static const sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 9e3564976e87..3c82200eb610 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -35,7 +35,7 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 3d2c65df5ba9..02a6c6a5ba78 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -71,7 +71,7 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -119,7 +119,7 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index b7b6cafee94a..183cf00a1e59 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -182,7 +182,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: @@ -276,7 +276,7 @@ public: virtual ~ScTPValidationHelp(); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -301,7 +301,7 @@ public: virtual ~ScTPValidationError(); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index ada6c99fb964..9caa442e2edf 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -65,7 +65,7 @@ SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new ScRedlineOptionsTabPage( pParent, rSet ); } -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 2bbee5a06d58..cff06b6995c7 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -133,7 +133,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) } -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() ); @@ -151,7 +151,7 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) if ( *pLocalOptions != *pOldOptions ) { - rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); + rCoreAttrs->Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); return true; } else @@ -179,7 +179,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) m_pEdEps->GrabFocus(); } else if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return nReturn; } diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 17ceca431145..2c6dfdf1d6a1 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -30,12 +30,12 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt return new ScTpCompatOptions(pParent, rCoreAttrs); } -bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) +bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) { bool bRet = false; if (m_pLbKeyBindings->IsValueChangedFromSaved()) { - rCoreAttrs.Put( + rCoreAttrs->Put( SfxUInt16Item( SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectEntryPos())); bRet = true; diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 637c6614c517..f68ee2f79046 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); } -bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) +bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) { bool bRet = false; ScDefaultsOptions aOpt; @@ -54,7 +54,7 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) aOpt.SetInitTabCount( nTabCount ); aOpt.SetInitTabPrefix( aSheetPrefix ); - rCoreSet.Put( ScTpDefaultsItem( SID_SCDEFAULTSOPTIONS, aOpt ) ); + rCoreSet->Put( ScTpDefaultsItem( SID_SCDEFAULTSOPTIONS, aOpt ) ); bRet = true; } return bRet; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 132008148259..587928018961 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -225,7 +225,7 @@ SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreS return new ScTpFormulaOptions(pParent, rCoreSet); } -bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) +bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) { bool bRet = false; ScFormulaOptions aOpt; @@ -279,7 +279,7 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) aOpt.SetOOXMLRecalcOptions(eOOXMLRecalc); aOpt.SetODFRecalcOptions(eODFRecalc); - rCoreSet.Put( ScTpFormulaItem( SID_SCFORMULAOPTIONS, aOpt ) ); + rCoreSet->Put( ScTpFormulaItem( SID_SCFORMULAOPTIONS, aOpt ) ); bRet = true; } return bRet; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 3890d4383c82..eb49658e800d 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -52,7 +52,7 @@ SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet& rAttrSe int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } @@ -87,9 +87,9 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) m_pForceBreaksCB->SaveValue(); } -bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpPrintOptions::FillItemSet( SfxItemSet* rCoreAttrs ) { - rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); + rCoreAttrs->ClearItem( SID_PRINT_SELECTEDSHEET ); bool bSkipEmptyChanged = m_pSkipEmptyPagesCB->IsValueChangedFromSaved(); bool bSelectedSheetsChanged = m_pSelectedSheetsCB->IsValueChangedFromSaved(); @@ -101,10 +101,10 @@ bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) aOpt.SetSkipEmpty( m_pSkipEmptyPagesCB->IsChecked() ); aOpt.SetAllSheets( !m_pSelectedSheetsCB->IsChecked() ); aOpt.SetForceBreaks( m_pForceBreaksCB->IsChecked() ); - rCoreAttrs.Put( ScTpPrintItem( SID_SCPRINTOPTIONS, aOpt ) ); + rCoreAttrs->Put( ScTpPrintItem( SID_SCPRINTOPTIONS, aOpt ) ); if ( bSelectedSheetsChanged ) { - rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); + rCoreAttrs->Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); } return true; } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 19c432f81f7f..06abb7ae9d53 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -192,7 +192,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) } } -bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpUserLists::FillItemSet( SfxItemSet* rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren @@ -225,7 +225,7 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) if ( pUserLists ) aULItem.SetUserList( *pUserLists ); - rCoreAttrs.Put( aULItem ); + rCoreAttrs->Put( aULItem ); } return bDataModified; @@ -234,7 +234,7 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 3c693ce6b6e8..2bf7d4d62f28 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -106,7 +106,7 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, return new ScTpContentOptions(pParent, rCoreSet); } -bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) { bool bRet = false; if( pFormulaCB ->IsValueChangedFromSaved() || @@ -130,17 +130,17 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(), pColorLB->GetSelectEntry() ); - rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); + rCoreSet->Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); bRet = true; } if(pRangeFindCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); bRet = true; } if(pSyncZoomCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); bRet = true; } @@ -216,7 +216,7 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) - FillItemSet(*pSetP); + FillItemSet(pSetP); return SfxTabPage::LEAVE_PAGE; } @@ -423,21 +423,21 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, return pNew; } -bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) { bool bRet = true; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); if ( m_pUnitLB->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos ); - rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC, + rCoreSet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nFieldUnit ) ); bRet = true; } if(m_pTabMF->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, + rCoreSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) ))); bRet = true; } @@ -465,56 +465,56 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) } if(m_pAlignCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); bRet = true; } if(m_pAlignLB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); + rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); bRet = true; } if(m_pEditModeCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); bRet = true; } if(m_pFormatCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); bRet = true; } if(m_pExpRefCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); bRet = true; } if(m_pMarkHdrCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); bRet = true; } if(m_pTextFmtCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); bRet = true; } if( m_pReplWarnCB->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); + rCoreSet->Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); bRet = true; } if( m_pLegacyCellSelectionCB->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); + rCoreSet->Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); bRet = true; } @@ -627,7 +627,7 @@ void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) - FillItemSet(*pSetP); + FillItemSet(pSetP); return SfxTabPage::LEAVE_PAGE; } diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index dcbcedac8c81..1ffa69423c1d 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -183,7 +183,7 @@ void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) } } -bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScHFEditPage::FillItemSet( SfxItemSet* rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = m_pWndLeft->CreateTextObject(); @@ -197,7 +197,7 @@ bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) delete pCenter; delete pRight; - rCoreSet.Put( aItem ); + rCoreSet->Put( aItem ); return true; } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3d495da48f0b..e1cf1d5d994c 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -87,19 +87,19 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) TurnOnHdl( 0 ); } -bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +bool ScHFPage::FillItemSet( SfxItemSet* rOutSet ) { bool bResult = SvxHFPage::FillItemSet( rOutSet ); if ( nId == SID_ATTR_PAGE_HEADERSET ) { - rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) ); - rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) ); } else { - rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) ); - rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) ); } return bResult; @@ -125,7 +125,7 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index e99f4566ca59..ac2453831436 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(); } -bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); @@ -239,32 +239,32 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) // sal_Bool flags bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnNotes->IsChecked(), m_pBtnNotes->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_GRID), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnGrid->IsChecked(), m_pBtnGrid->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_HEADERS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnHeaders->IsChecked(), m_pBtnHeaders->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_TOPDOWN), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnTopDown->IsChecked(), m_pBtnTopDown->GetSavedValue() ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_FORMULAS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnFormulas->IsChecked(), m_pBtnFormulas->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NULLVALS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnNullVals->IsChecked(), m_pBtnNullVals->GetSavedValue() != TRISTATE_FALSE ); @@ -276,7 +276,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) || ( bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue() && ! m_pEdPageNo->IsValueChangedFromSaved() ) ) ) { - rCoreSet.ClearItem( nWhichPageNo ); + rCoreSet->ClearItem( nWhichPageNo ); } else { @@ -284,19 +284,19 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) ? m_pEdPageNo->GetValue() : 0 ); - rCoreSet.Put( SfxUInt16Item( nWhichPageNo, nPage ) ); + rCoreSet->Put( SfxUInt16Item( nWhichPageNo, nPage ) ); bDataChanged = true; } // object representation: bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_CHARTS), - rCoreSet, rOldSet, *m_pBtnCharts ); + *rCoreSet, rOldSet, *m_pBtnCharts ); bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_OBJECTS), - rCoreSet, rOldSet, *m_pBtnObjects ); + *rCoreSet, rOldSet, *m_pBtnObjects ); bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_DRAWINGS), - rCoreSet, rOldSet, *m_pBtnDrawings ); + *rCoreSet, rOldSet, *m_pBtnDrawings ); // scaling: if( !m_pEdScalePageWidth->GetValue() && !m_pEdScalePageHeight->GetValue() ) @@ -306,17 +306,17 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) } bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALE), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_PERCENT, *m_pEdScaleAll, (sal_uInt16)m_pEdScaleAll->GetValue() ); bDataChanged |= lcl_PutScaleItem2( GetWhich(SID_SCATTR_PAGE_SCALETO), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_TO, *m_pEdScalePageWidth, *m_pEdScalePageHeight ); bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALETOPAGES), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_TO_PAGES, *m_pEdScalePageNum, (sal_uInt16)m_pEdScalePageNum->GetValue() ); @@ -326,7 +326,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) int ScTablePage::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } |