diff options
Diffstat (limited to 'sw')
66 files changed, 220 insertions, 220 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 33bd0fbb4441..8797e1ca133c 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -233,7 +233,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) } } -bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) +bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) { OUString sURL = m_pURLED->GetText(); if(!sURL.isEmpty()) @@ -271,10 +271,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) if(m_pTextED->IsModified()) { bModified = true; - rSet.Put(SfxStringItem(FN_PARAM_SELECTION, m_pTextED->GetText())); + rSet->Put(SfxStringItem(FN_PARAM_SELECTION, m_pTextED->GetText())); } if(bModified) - rSet.Put(aINetFmt); + rSet->Put(aINetFmt); return bModified; } diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 5edfda138434..adf11c0a13af 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -581,10 +581,10 @@ SfxTabPage* SwDropCapsPage::Create(Window *pParent, return new SwDropCapsPage(pParent, rSet); } -bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) +bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) { if(bModified) - FillSet(rSet); + FillSet(*rSet); return bModified; } diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 240d5d704146..8dfdcb9b8b92 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -101,17 +101,17 @@ const sal_uInt16* SwParagraphNumTabPage::GetRanges() return aPageRg; } -bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_pOutlineLvLB->IsValueChangedFromSaved()) { const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectEntryPos(); - const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( rSet, SID_ATTR_PARA_OUTLINE_LEVEL); + const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( *rSet, SID_ATTR_PARA_OUTLINE_LEVEL); if (pOldOutlineLv) { SfxUInt16Item* pOutlineLv = (SfxUInt16Item*)pOldOutlineLv->Clone(); pOutlineLv->SetValue( aOutlineLv ); - rSet.Put(*pOutlineLv); + rSet->Put(*pOutlineLv); delete pOutlineLv; bModified = true; } @@ -122,12 +122,12 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) OUString aStyle; if(m_pNumberStyleLB->GetSelectEntryPos()) aStyle = m_pNumberStyleLB->GetSelectEntry(); - const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( rSet, SID_ATTR_PARA_NUMRULE); + const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE); SfxStringItem* pRule = pOldRule ? (SfxStringItem*)pOldRule->Clone() : NULL; if (pRule) { pRule->SetValue(aStyle); - rSet.Put(*pRule); + rSet->Put(*pRule); delete pRule; bModified = true; } @@ -139,8 +139,8 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); - rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); - rSet.Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, + rSet->Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); + rSet->Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)m_pNewStartNF->GetValue() : USHRT_MAX)); } @@ -152,7 +152,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) aFmt.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ? m_pRestartNF->GetValue() : 0 )); aFmt.SetCountLines( m_pCountParaCB->IsChecked() ); - rSet.Put(aFmt); + rSet->Put(aFmt); bModified = true; } return bModified; diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index e38941ac9a29..da29f85c9c8c 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -132,7 +132,7 @@ SwCondCollPage::~SwCondCollPage() int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } @@ -142,7 +142,7 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwCondCollPage(pParent, rSet); } -bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) +bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) { bool bModified = true; SwCondCollItem aCondItem; @@ -151,7 +151,7 @@ bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) const OUString sEntry = m_pTbLinks->GetEntryText(i, 1); aCondItem.SetStyle( &sEntry, i); } - rSet.Put(aCondItem); + rSet->Put(aCondItem); return bModified; } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index aae0529109e6..5bf65b411cf3 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -143,7 +143,7 @@ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS return new SwMailConfigPage(pParent, rAttrSet); } -bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) { if(m_pDisplayNameED->IsValueChangedFromSaved()) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 5a5fb9cc0b9a..9dd4105dca11 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -405,7 +405,7 @@ SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& r return new SwCompatibilityOptPage( pParent, rAttrSet ); } -bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) +bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) { bool bModified = false; if ( m_pWrtShell ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index af52de99b9d4..dcfa398966f5 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -138,7 +138,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl) return 0; } -bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) +bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) { bool bRet = false; SwModule* pMod = SW_MOD(); @@ -180,13 +180,13 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } if(m_pTabMF->IsVisible() && m_pTabMF->IsValueChangedFromSaved()) { - rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, + rSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)))); bRet = true; } @@ -196,7 +196,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled(); if( (bIsUseCharUnitFlag ? 1 : 0) != m_pUseCharUnit->GetSavedValue()) { - rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); + rSet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); bRet = true; } @@ -529,7 +529,7 @@ SfxTabPage* SwCaptionOptPage::Create( Window* pParent, return new SwCaptionOptPage(pParent, rAttrSet ); } -bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) +bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index cf8f4fc4787f..460846e4b220 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -211,7 +211,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) AnyRulerHdl(m_pAnyRulerCB); } -bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) +bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) { const SwElemItem* pOldAttr = (const SwElemItem*) GetOldItem(GetItemSet(), FN_PARAM_ELEM); @@ -235,7 +235,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) bool bRet = !pOldAttr || aElem != *pOldAttr; if(bRet) - bRet = 0 != rSet.Put(aElem); + bRet = 0 != rSet->Put(aElem); sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); sal_Int32 nGlobalMetricPos = nMPos; @@ -243,7 +243,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } @@ -252,7 +252,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pHMetric->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); bRet = true; } nMPos = m_pVMetric->GetSelectEntryPos(); @@ -260,7 +260,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pVMetric->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) ); bRet = true; } return bRet; @@ -367,7 +367,7 @@ SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); } -bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) { @@ -403,7 +403,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) const OUString sFax = m_pFaxLB->GetSelectEntry(); aAddPrinterAttr.sFaxName = sNone == sFax ? aEmptyOUStr : sFax; - rCoreSet.Put(aAddPrinterAttr); + rCoreSet->Put(aAddPrinterAttr); } return bAttrModified; } @@ -614,7 +614,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); } -bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) +bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) { bool bNotDocOnly = !pDocOnlyCB->IsChecked(); SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly); @@ -1097,7 +1097,7 @@ SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, return new SwTableOptionsTabPage(pParent, rAttrSet ); } -bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); @@ -1337,7 +1337,7 @@ void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) SetWrtShell(pWrtSh->GetValue()); } -bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet* rSet ) { SwShadowCursorItem aOpt; aOpt.SetOn( m_pOnOffCB->IsChecked() ); @@ -1355,10 +1355,10 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) bool bRet = false; const SfxPoolItem* pItem = 0; - if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem ) + if( SFX_ITEM_SET != rSet->GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem ) || ((SwShadowCursorItem&)*pItem) != aOpt ) { - rSet.Put( aOpt ); + rSet->Put( aOpt ); bRet = true; } @@ -1370,7 +1370,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if( m_pCrsrInProtCB->IsValueChangedFromSaved()) { - rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); + rSet->Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); bRet = true; } @@ -1393,7 +1393,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) bRet |= (!pOldAttr || aDisp != *pOldAttr); if(bRet) - bRet = 0 != rSet.Put(aDisp); + bRet = 0 != rSet->Put(aDisp); return bRet; } @@ -1733,7 +1733,7 @@ SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwRedlineOptionsTabPage( pParent, rSet ); } -bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) { CharAttr *pAttr; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2233,7 +2233,7 @@ SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwCompareOptionsTabPage( pParent, rAttrSet ); } -bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2358,7 +2358,7 @@ SfxTabPage* SwTestTabPage::Create( Window* pParent, return new SwTestTabPage(pParent, rAttrSet); } -bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) @@ -2374,7 +2374,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) aTestItem.bTest8=m_pTest8CBox->IsChecked(); aTestItem.bTest9=m_pTest9CBox->IsChecked(); aTestItem.bTest10=m_pTest10CBox->IsChecked(); - rCoreSet.Put(aTestItem); + rCoreSet->Put(aTestItem); } return bAttrModified; } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 8dc93ddb9512..4d237209aeef 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -77,7 +77,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) } // Description: fill ItemSet when changed -bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/) +bool SwDocStatPage::FillItemSet(SfxItemSet * /*rSet*/) { return false; } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a4f4fd0f1215..a43d048545aa 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1572,7 +1572,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) } } -bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) +bool SwInsertSectionTabPage::FillItemSet( SfxItemSet* ) { SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText()); aSection.SetCondition(m_pConditionED->GetText()); @@ -1837,7 +1837,7 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage() { } -bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet* rSet ) { SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked() ? ( pFtnNtNumCB->IsChecked() @@ -1881,8 +1881,8 @@ bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) // no break; } - rSet.Put( aFtn ); - rSet.Put( aEnd ); + rSet->Put( aFtn ); + rSet->Put( aEnd ); return true; } @@ -2098,7 +2098,7 @@ SwSectionIndentTabPage::~SwSectionIndentTabPage() { } -bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) +bool SwSectionIndentTabPage::FillItemSet( SfxItemSet* rSet) { if(m_pBeforeMF->IsValueModified() || m_pAfterMF->IsValueModified()) @@ -2106,7 +2106,7 @@ bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) SvxLRSpaceItem aLRSpace( static_cast< long >(m_pBeforeMF->Denormalize(m_pBeforeMF->GetValue(FUNIT_TWIP))) , static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))), 0, 0, RES_LR_SPACE); - rSet.Put(aLRSpace); + rSet->Put(aLRSpace); } return true; } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index c816fe933972..6ec8cab83818 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -457,7 +457,7 @@ void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -485,10 +485,10 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem) } } -bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvFmtPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 777cdf25d00b..28cc5cd395b7 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -65,7 +65,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index b4172fe81664..4e56860cfa4d 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -323,7 +323,7 @@ int SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -334,10 +334,10 @@ void SwEnvPage::FillItem(SwEnvItem& rItem) rItem.aSendText = m_pSenderEdit->GetText(); } -bool SwEnvPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 252cf04ac0d9..304737608b33 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -141,7 +141,7 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet&) int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -163,10 +163,10 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem) rItem.lShiftDown = static_cast< sal_Int32 >(GetFldVal(*m_pDownField )); } -bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 73eb2ddc5e45..9c937b75adbe 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -64,7 +64,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index db98aa82930a..7efb173754f5 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -473,7 +473,7 @@ void SwLabPage::ActivatePage(const SfxItemSet& rSet) int SwLabPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -494,10 +494,10 @@ void SwLabPage::FillItem(SwLabItem& rItem) rItem.aLstType = m_pTypeBox->GetSelectEntry(); } -bool SwLabPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPage::FillItemSet(SfxItemSet* rSet) { FillItem( aItem ); - rSet.Put( aItem ); + rSet->Put( aItem ); return true; } @@ -610,11 +610,11 @@ void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) +bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet) { const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData( m_pAutoTextGroupLB->GetSelectEntryPos()); @@ -626,7 +626,7 @@ bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) SvTreeListEntry* pSelEntry = m_pAutoTextLB->FirstSelected(); if(pSelEntry) aLabItem.sGlossaryBlockName = *(OUString*)pSelEntry->GetUserData(); - rSet.Put(aLabItem); + rSet->Put(aLabItem); return true; } @@ -743,11 +743,11 @@ void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) +bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -770,7 +770,7 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) aItem.aPrivWWW = m_pHomePageED->GetText( ); aItem.aPrivMail = m_pMailED->GetText( ); - rSet.Put(aItem); + rSet->Put(aItem); return true; } @@ -831,11 +831,11 @@ void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) +bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -854,7 +854,7 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) aItem.aCompWWW = m_pHomePageED->GetText(); aItem.aCompMail = m_pMailED->GetText(); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 49593db120b8..d2cb08201325 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -478,7 +478,7 @@ void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -503,10 +503,10 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) } } -bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet) { FillItem(aItem); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 27d93db4e9bb..d84ffc03c1f6 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -108,7 +108,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index cc5a9e3c152a..65ddb7ebc746 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -107,7 +107,7 @@ void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) { if ( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -120,12 +120,12 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem) rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled(); } -bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem; GetParentSwLabDlg()->GetLabItem(aItem); FillItem(aItem); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 4cd62fbc3176..011ccea625ff 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -61,7 +61,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline Printer* GetPrt() { return (pPrinter); } }; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index b00f6fd68f68..62436bd6bdc5 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -69,7 +69,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -120,7 +120,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -158,7 +158,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -194,7 +194,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 935403bbc76d..a302e4e8ec0b 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -178,7 +178,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } } -bool SwFldDBPage::FillItemSet(SfxItemSet& ) +bool SwFldDBPage::FillItemSet(SfxItemSet* ) { OUString sTableName; OUString sColumnName; diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 4f2bf1ba6eed..90e5311965d4 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -74,7 +74,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 5e18019f02e4..279dfab73df2 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -414,7 +414,7 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) return nSize; } -bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) +bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) { if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX) return false; diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 24ba93b89c9b..50e49f92aacc 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -65,7 +65,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 7b265d170c1d..ab0c365b943b 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) return 0; } -bool SwFldDokPage::FillItemSet(SfxItemSet& ) +bool SwFldDokPage::FillItemSet(SfxItemSet* ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 4af41fdfe6d3..9e549b77d9eb 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -67,7 +67,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 54b938b48f7c..c69391281622 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, OKHdl) SfxTabPage* pTabPage = GetTabPage(); if (pTabPage) { - pTabPage->FillItemSet(*(SfxItemSet*)0); + pTabPage->FillItemSet(0); } EndDialog( RET_OK ); @@ -247,7 +247,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) //#112462# FillItemSet may delete the current field //that's why it has to be called before accessing the current field if( GetOKButton()->IsEnabled() ) - pTabPage->FillItemSet(*(SfxItemSet*)0); + pTabPage->FillItemSet(0); SwFldMgr& rMgr = pTabPage->GetFldMgr(); SwField *pCurFld = rMgr.GetCurFld(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 00a37dac4419..868d72fe6629 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -510,7 +510,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) return 0; } -bool SwFldFuncPage::FillItemSet(SfxItemSet& ) +bool SwFldFuncPage::FillItemSet(SfxItemSet* ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 434f884172c1..434999ebae54 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -89,7 +89,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 65aa5df431b5..c1ebf3494478 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -756,7 +756,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl) return 0; } -bool SwFldRefPage::FillItemSet(SfxItemSet& ) +bool SwFldRefPage::FillItemSet(SfxItemSet* ) { bool bModified = false; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index a8102aa544d0..cb4ac98a8dfb 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -80,7 +80,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fe6829a999d5..536f0fee99bb 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -185,7 +185,7 @@ IMPL_LINK_NOARG(SwFldDlg, OKHdl) if (GetOKButton().IsEnabled()) { SfxTabPage* pPage = GetTabPage(GetCurPageId()); - pPage->FillItemSet(*(SfxItemSet*)0); + pPage->FillItemSet(0); GetOKButton().GrabFocus(); // because of InputField-Dlg } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 1079a22bb483..f392afc0b88d 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1089,7 +1089,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl) return 0; } -bool SwFldVarPage::FillItemSet(SfxItemSet& ) +bool SwFldVarPage::FillItemSet(SfxItemSet* ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index ab4222e4245b..203882935813 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -96,7 +96,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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index ab22c2824587..2fd3c2beb24f 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -247,7 +247,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) } if(pBox) { - pTabPage->FillItemSet(*pSet); + pTabPage->FillItemSet(pSet); } nOldSelection = (sal_IntPtr)m_pApplyToLB->GetEntryData(m_pApplyToLB->GetSelectEntryPos()); long nWidth = nSelectionWidth; @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl) bFrameChanged = true; break; } - pTabPage->FillItemSet(*pSet); + pTabPage->FillItemSet(pSet); if(pSelectionSet && SFX_ITEM_SET == pSelectionSet->GetItemState(RES_COL)) { @@ -627,7 +627,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwColumnPage(pParent, rSet); } // stuff attributes into the Set when OK -bool SwColumnPage::FillItemSet(SfxItemSet &rSet) +bool SwColumnPage::FillItemSet(SfxItemSet *rSet) { if(m_pCLNrEdt->HasChildPathFocus()) m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); @@ -636,13 +636,13 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) const SfxPoolItem* pOldItem; const SwFmtCol& rCol = pColMgr->GetColumns(); - if(0 == (pOldItem = GetOldItem( rSet, RES_COL )) || + if(0 == (pOldItem = GetOldItem( *rSet, RES_COL )) || rCol != *pOldItem ) - rSet.Put(rCol); + rSet->Put(rCol); if(m_pBalanceColsCB->IsVisible() ) { - rSet.Put(SwFmtNoBalancedColumns(!m_pBalanceColsCB->IsChecked() )); + rSet->Put(SwFmtNoBalancedColumns(!m_pBalanceColsCB->IsChecked() )); } if( m_pTextDirectionLB->IsVisible()) { @@ -650,7 +650,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos ); - rSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); + rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); } } return true; @@ -1229,7 +1229,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet) int SwColumnPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b96ed9ad5fe5..4558f73d8629 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1024,7 +1024,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) } // stuff attributes into the set when OK -bool SwFrmPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() @@ -1037,11 +1037,11 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) if ( !bFormat ) { - pOldItem = GetOldItem(rSet, RES_ANCHOR); + pOldItem = GetOldItem(*rSet, RES_ANCHOR); if (bNew || !pOldItem || eAnchorId != ((const SwFmtAnchor*)pOldItem)->GetAnchorId()) { SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() ); - bRet = 0 != rSet.Put( aAnc ); + bRet = 0 != rSet->Put( aAnc ); } } @@ -1068,7 +1068,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aHoriOrient.SetPos( nX ); } - pOldItem = GetOldItem(rSet, FN_HORI_ORIENT); + pOldItem = GetOldItem(*rSet, FN_HORI_ORIENT); bool bSame = false; if ((bNew == bFormat) && pOldItem) { @@ -1076,7 +1076,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame)) { - bRet |= 0 != rSet.Put( aHoriOrient ); + bRet |= 0 != rSet->Put( aHoriOrient ); } } @@ -1107,7 +1107,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } aVertOrient.SetPos( nY ); } - pOldItem = GetOldItem(rSet, FN_VERT_ORIENT); + pOldItem = GetOldItem(*rSet, FN_VERT_ORIENT); bool bSame = false; if((bNew == bFormat) && pOldItem) { @@ -1119,7 +1119,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame )) { - bRet |= 0 != rSet.Put( aVertOrient ); + bRet |= 0 != rSet->Put( aVertOrient ); } } @@ -1198,9 +1198,9 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } } if( !bFormat && m_pFixedRatioCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); + bRet |= 0 != rSet->Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); - pOldItem = GetOldItem(rSet, RES_FRM_SIZE); + pOldItem = GetOldItem(*rSet, RES_FRM_SIZE); if ((pOldItem && aSz != *pOldItem) || (!pOldItem && !bFormat) || (bFormat && @@ -1210,11 +1210,11 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) if (aSz.GetHeightSizeType() == ATT_VAR_SIZE) // there is no VAR_SIZE in frames aSz.SetHeightSizeType(ATT_MIN_SIZE); - bRet |= 0 != rSet.Put( aSz ); + bRet |= 0 != rSet->Put( aSz ); } if(m_pFollowTextFlowCB->IsValueChangedFromSaved()) { - bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); + bRet |= 0 != rSet->Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); } return bRet; } @@ -1710,7 +1710,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) { if ( _pSet ) { - FillItemSet( *_pSet ); + FillItemSet( _pSet ); //FillItemSet doesn't set the anchor into the set when it matches //the original. But for the other pages we need the current anchor. @@ -2485,7 +2485,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) m_pBmpWin->Invalidate(); } -bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) +bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet ) { bool bModified = false; if ( m_pMirrorHorzBox->IsValueChangedFromSaved() || @@ -2511,14 +2511,14 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) bool bMirror = !m_pAllPagesRB->IsChecked(); SwMirrorGrf aMirror( eMirror ); aMirror.SetGrfToggle(bMirror ); - rSet.Put( aMirror ); + rSet->Put( aMirror ); } if( aGrfName != aNewGrfName || m_pConnectED->IsModified() ) { bModified = true; aGrfName = m_pConnectED->GetText(); - rSet.Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT, + rSet->Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT, SID_ATTR_GRAF_GRAPHIC )); } return bModified; @@ -2527,7 +2527,7 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return sal_True; } @@ -2752,10 +2752,10 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) pClientCB->SaveValue(); } -bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) { bool bModified = false; - const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(rSet, RES_URL); + const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(*rSet, RES_URL); boost::scoped_ptr<SwFmtURL> pFmtURL; if(pOldURL) pFmtURL.reset((SwFmtURL*)pOldURL->Clone()); @@ -2786,7 +2786,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) pFmtURL->SetTargetFrameName(pFrameCB->GetText()); bModified = true; } - rSet.Put(*pFmtURL); + rSet->Put(*pFmtURL); return bModified; } @@ -3043,28 +3043,28 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) m_pVertAlignLB->SaveValue(); } -bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; if (pNameED->IsValueChangedFromSaved()) - bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); + bRet |= 0 != rSet->Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); if (pAltNameED->IsValueChangedFromSaved()) - bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); + bRet |= 0 != rSet->Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); const SfxPoolItem* pOldItem; SvxProtectItem aProt ( (const SvxProtectItem& )GetItemSet().Get(RES_PROTECT) ); aProt.SetCntntProtect( pProtectContentCB->IsChecked() ); aProt.SetSizeProtect ( pProtectSizeCB->IsChecked() ); aProt.SetPosProtect ( pProtectFrameCB->IsChecked() ); - if ( 0 == (pOldItem = GetOldItem(rSet, FN_SET_PROTECT)) || + if ( 0 == (pOldItem = GetOldItem(*rSet, FN_SET_PROTECT)) || aProt != *pOldItem ) - bRet |= 0 != rSet.Put( aProt); + bRet |= 0 != rSet->Put( aProt); if ( pEditInReadonlyCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); + bRet |= 0 != rSet->Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); if ( pPrintFrameCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); + bRet |= 0 != rSet->Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); // textflow if( pTextFlowLB->IsVisible() ) @@ -3073,7 +3073,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) if( pTextFlowLB->IsValueChangedFromSaved() ) { sal_uInt16 nData = (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( nPos ); - bRet |= 0 != rSet.Put( SvxFrameDirectionItem( + bRet |= 0 != rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nData, RES_FRAMEDIR )); } } @@ -3096,9 +3096,9 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) if ((pFlyFmt = rChain.GetNext()) != 0) sNextChain = pFlyFmt->GetName(); if(sPrevChain != sCurrentPrevChain) - bRet |= 0 != rSet.Put(SfxStringItem(FN_PARAM_CHAIN_PREVIOUS, sCurrentPrevChain)); + bRet |= 0 != rSet->Put(SfxStringItem(FN_PARAM_CHAIN_PREVIOUS, sCurrentPrevChain)); if(sNextChain != sCurrentNextChain) - bRet |= 0 != rSet.Put(SfxStringItem(FN_PARAM_CHAIN_NEXT, sCurrentNextChain)); + bRet |= 0 != rSet->Put(SfxStringItem(FN_PARAM_CHAIN_NEXT, sCurrentNextChain)); } } @@ -3112,7 +3112,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) case 1 : nAdjust = SDRTEXTVERTADJUST_CENTER; break; case 2 : nAdjust = SDRTEXTVERTADJUST_BOTTOM; break; } - bRet |= 0 != rSet.Put(SdrTextVertAdjustItem(nAdjust, RES_TEXT_VERT_ADJUST)); + bRet |= 0 != rSet->Put(SdrTextVertAdjustItem(nAdjust, RES_TEXT_VERT_ADJUST)); } return bRet; diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index a1b72dbcf44d..f396d331947d 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -269,7 +269,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) } // stuff attributes into the set when OK -bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) +bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) { bool bModified = false; const SfxPoolItem* pOldItem; @@ -309,19 +309,19 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bContour ) aSur.SetOutside(m_pWrapOutsideCB->IsChecked()); - if(0 == (pOldItem = GetOldItem( rSet, RES_SURROUND )) || + if(0 == (pOldItem = GetOldItem( *rSet, RES_SURROUND )) || aSur != *pOldItem ) { - rSet.Put(aSur); + rSet->Put(aSur); bModified = true; } if (!bDrawMode) { - if(0 == (pOldItem = GetOldItem( rSet, FN_OPAQUE )) || + if(0 == (pOldItem = GetOldItem( *rSet, FN_OPAQUE )) || aOp != *pOldItem ) { - rSet.Put(aOp); + rSet->Put(aOp); bModified = true; } } @@ -335,10 +335,10 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bTopMod || bBottomMod ) { - if(0 == (pOldItem = GetOldItem(rSet, RES_UL_SPACE)) || + if(0 == (pOldItem = GetOldItem(*rSet, RES_UL_SPACE)) || aUL != *pOldItem ) { - rSet.Put( aUL, RES_UL_SPACE ); + rSet->Put( aUL, RES_UL_SPACE ); bModified = true; } } @@ -352,10 +352,10 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bLeftMod || bRightMod ) { - if( 0 == (pOldItem = GetOldItem(rSet, RES_LR_SPACE)) || + if( 0 == (pOldItem = GetOldItem(*rSet, RES_LR_SPACE)) || aLR != *pOldItem ) { - rSet.Put(aLR, RES_LR_SPACE); + rSet->Put(aLR, RES_LR_SPACE); bModified = true; } } @@ -364,7 +364,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled(); if ((m_pWrapTransparentCB->GetSavedValue() == 1) != bChecked) - bModified |= 0 != rSet.Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); + bModified |= 0 != rSet->Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); } return bModified; @@ -559,7 +559,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 0589d6b470b7..74f167cc8b90 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -902,7 +902,7 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh) } } -bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXSelectTabPage::FillItemSet( SfxItemSet* ) { return true; } @@ -1894,7 +1894,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() { } -bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXEntryTabPage::FillItemSet( SfxItemSet* ) { // nothing to do return true; @@ -3512,7 +3512,7 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage() delete m_pCurrentForm; } -bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXStylesTabPage::FillItemSet( SfxItemSet* ) { return true; } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 7b9f5d246513..86c99c966613 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -61,10 +61,10 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 ); SfxTabPage *pPage = GetTabPage( m_nFootNoteId ); if ( pPage ) - pPage->FillItemSet( aDummySet ); + pPage->FillItemSet( &aDummySet ); pPage = GetTabPage( m_nEndNoteId ); if ( pPage ) - pPage->FillItemSet( aDummySet ); + pPage->FillItemSet( &aDummySet ); aOldOkHdl.Call( pBtn ); return 0; } @@ -344,7 +344,7 @@ static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtNa return pFmt; } -bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) +bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) { boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFtnInfo()); diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 19b26e1090dc..349a43194e51 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,7 +72,7 @@ public: virtual ~SwEndNoteOptionPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void SetShell( SwWrtShell &rShell ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index d81d767c04ca..1bf0db625ce6 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -402,20 +402,20 @@ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } -bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) { if(pOutlineDlg) *pOutlineDlg->GetNumRule() = *pActNum; else if(bModified && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SwUINumRuleItem( *pSaveNum )); - rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, false)); + rSet->Put(SwUINumRuleItem( *pSaveNum )); + rSet->Put(SfxBoolItem(FN_PARAM_NUM_PRESET, false)); } return bModified; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 50ccf9ea16be..a7ce9a4d4028 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -817,7 +817,7 @@ int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) return LEAVE_PAGE; } -bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) +bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet* ) { return true; } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 29704905edb6..600905f847c9 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -254,7 +254,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) } // stuff attributes into the set, when OK -bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) +bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) { SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO)); @@ -294,9 +294,9 @@ bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) rFtnInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100)); const SfxPoolItem* pOldItem; - if(0 == (pOldItem = GetOldItem( rSet, FN_PARAM_FTN_INFO )) || + if(0 == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) || aItem != *pOldItem ) - rSet.Put(aItem); + rSet->Put(aItem); return true; } @@ -352,7 +352,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) int SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index a0539e93ae6b..017d2a530a42 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -158,7 +158,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwTextGridPage(pParent, rSet); } -bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) +bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; if(m_pNoGridRB->IsValueChangedFromSaved() || @@ -174,7 +174,7 @@ bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) m_pPrintCB->IsValueChangedFromSaved() || m_pColorLB->IsValueChangedFromSaved()) { - PutGridItem(rSet); + PutGridItem(*rSet); bRet = true; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index f102f15a2599..fd0211cc5406 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -374,7 +374,7 @@ SfxTabPage* SwFormatTablePage::Create( Window* pParent, return new SwFormatTablePage( pParent, rAttrSet ); } -bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) { //Test if one of the controls still has the focus if (m_aWidthMF.HasFocus()) @@ -396,13 +396,13 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) SvxULSpaceItem aULSpace(RES_UL_SPACE); aULSpace.SetUpper( m_pTopMF->Denormalize(m_pTopMF->GetValue( FUNIT_TWIP ))); aULSpace.SetLower( m_pBottomMF->Denormalize(m_pBottomMF->GetValue( FUNIT_TWIP ))); - rCoreSet.Put(aULSpace); + rCoreSet->Put(aULSpace); } } if(m_pNameED->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); + rCoreSet->Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); bModified = true; } @@ -413,7 +413,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) { const sal_uInt32 nDirection = (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos ); - rCoreSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); + rCoreSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); bModified = true; } } @@ -609,7 +609,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); if(bModified) { SwTwips lLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP ))); @@ -906,7 +906,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) return 0; } -bool SwTableColumnPage::FillItemSet( SfxItemSet& ) +bool SwTableColumnPage::FillItemSet( SfxItemSet* ) { for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) { @@ -1109,7 +1109,7 @@ int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); if(text::HoriOrientation::FULL != pTblData->GetAlign() && pTblData->GetWidth() != nTableWidth) { pTblData->SetWidth(nTableWidth); @@ -1321,7 +1321,7 @@ SfxTabPage* SwTextFlowPage::Create( Window* pParent, return new SwTextFlowPage(pParent, rAttrSet); } -bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) +bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -1329,20 +1329,20 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if(m_pHeadLineCB->IsValueChangedFromSaved() || m_pRepeatHeaderNF->IsValueChangedFromSaved() ) { - bModified |= 0 != rSet.Put( + bModified |= 0 != rSet->Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); } if(m_pKeepCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); + bModified |= 0 != rSet->Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); if(m_pSplitCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); + bModified |= 0 != rSet->Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); if(m_pSplitRowCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); + bModified |= 0 != rSet->Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); - const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK ); - const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC ); + const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( *rSet, RES_BREAK ); + const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( *rSet, RES_PAGEDESC ); bool bState = m_pPageCollCB->IsChecked(); @@ -1366,7 +1366,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) { SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, true ) ); aFmt.SetNumOffset(bState ? nPgNum : 0); - bModified |= 0 != rSet.Put( aFmt ); + bModified |= 0 != rSet->Put( aFmt ); bPageItemPut = bState; } } @@ -1406,13 +1406,13 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if ( !pBreak || !( *(const SvxFmtBreakItem*)pBreak == aBreak ) ) { - bModified |= 0 != rSet.Put( aBreak ); + bModified |= 0 != rSet->Put( aBreak ); } } if(m_pTextDirectionLB->IsValueChangedFromSaved()) { - bModified |= 0 != rSet.Put( + bModified |= 0 != rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)(sal_uLong)m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos()) , FN_TABLE_BOX_TEXTORIENTATION)); @@ -1428,7 +1428,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) case 2 : nOrient = text::VertOrientation::BOTTOM; break; } if(nOrient != USHRT_MAX) - bModified |= 0 != rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, nOrient)); + bModified |= 0 != rSet->Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, nOrient)); } return bModified; diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 50770d7f7f55..1ffd7ed11ae1 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -85,7 +85,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; }; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 84c428478562..1e6f3a6499bc 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -175,7 +175,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFrmMode(bool bMod); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index ec28d0de6874..06ab49936336 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; DECL_LINK(UpdateHdl, void *); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index a906419e00a9..e6e35e6a5edd 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -85,7 +85,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormat(bool bSet){bFormat = bSet;} diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 9af6f3e761ae..7195d645f0ec 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -110,7 +110,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index edffb7ebd7fc..2a4b5bc47e29 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -188,7 +188,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } @@ -234,7 +234,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; @@ -263,7 +263,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; }; @@ -311,7 +311,7 @@ public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormatUsed(bool bFmt); diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 4872c61919e6..948c255a74e7 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -61,7 +61,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; }; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 63a8a6dd20d2..64088e5ece94 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -121,7 +121,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 872c015d5f08..4042001c19cb 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -67,7 +67,7 @@ public: const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void EnableNewStart(); diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 2cd02b60fde8..dd437c072e36 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -65,7 +65,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; }; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index e6a09bb1e4ac..5f3ea8703738 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -68,7 +68,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; }; @@ -169,7 +169,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; }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 17dc981d8cc7..15e0ccec95dd 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -74,7 +74,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; }; @@ -122,7 +122,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; void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); @@ -194,7 +194,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; void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} @@ -236,7 +236,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; void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} @@ -280,7 +280,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; void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } @@ -360,7 +360,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; }; @@ -377,7 +377,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; private: @@ -420,7 +420,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; }; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 41bbd0a85f9f..829cf853406a 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -127,7 +127,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 1e96c857c85f..9c4ba3bdaf46 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - 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/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 58664756b0dd..a68e12313a82 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -87,7 +87,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 20b200632c7a..51f56256fcd3 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -187,7 +187,7 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, @@ -229,7 +229,7 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, @@ -247,7 +247,7 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 275ae6c99484..8aacddc39ba1 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -64,7 +64,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; void SetCollection( SwFmt* pFormat, bool bNew ); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index aa1387b893fa..2acce7ddb705 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -222,7 +222,7 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; @@ -435,7 +435,7 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -481,7 +481,7 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 5efcdababe7c..71439d3c9ede 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -99,7 +99,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; static const sal_uInt16* GetRanges(); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 8583214a92aa..e71c6b9f67a5 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -83,7 +83,7 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -133,7 +133,7 @@ public: virtual ~SwTableColumnPage(); 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -182,7 +182,7 @@ class SwTextFlowPage : public SfxTabPage 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; void SetShell(SwWrtShell* pSh); |