diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-08-04 15:17:03 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-08-04 15:57:04 +0200 |
commit | 1af0e36fb6b1a013db6b4f2875be8a85fd67c2a2 (patch) | |
tree | 02e49f899acf8c43a320e62052a836fdde91f309 | |
parent | 14d0096300685ec508b3b54d773db7767ce3b429 (diff) |
kill va_args abuse for SfxItemSet
Change-Id: I200addfdf551f1b8437b704c481d397c53440dcd
-rw-r--r-- | sc/source/core/data/stlsheet.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/defaultproperties.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unosect.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/unocore/unotext.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewtab.cxx | 4 |
9 files changed, 10 insertions, 22 deletions
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index e13f0ec8f5c0..0b5fd7212454 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -240,9 +240,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() case SFX_STYLE_FAMILY_PARA: default: - pSet = new SfxItemSet( GetPool().GetPool(), - ATTR_PATTERN_START, ATTR_PATTERN_END, - 0 ); + pSet = new SfxItemSet( GetPool().GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); break; } bMySet = true; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 495a070588ca..963c169f042f 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1211,7 +1211,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell { // The value is attached to a toggleable attribute (Bools) sal_uInt16 nWhich = pSlot->GetWhich(rPool); - SfxItemSet aSet(rPool, nWhich, nWhich, 0); + SfxItemSet aSet(rPool, nWhich, nWhich); SfxStateFunc aFunc = pSlot->GetStateFnc(); pShell->CallState( aFunc, aSet ); const SfxPoolItem *pOldItem; diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index aa6b10c1582e..11874f13bbb0 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -154,7 +154,7 @@ namespace sdr const SfxPoolItem *pPoolItem; std::vector< sal_uInt16 > aPostItemChangeList; sal_Bool bDidChange(sal_False); - SfxItemSet aSet(*GetSdrObject().GetObjectItemPool(), SDRATTR_START, EE_ITEMS_END, 0, 0); + SfxItemSet aSet(*GetSdrObject().GetObjectItemPool(), SDRATTR_START, EE_ITEMS_END); // give a hint to STL_Vector aPostItemChangeList.reserve(rSet.Count()); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 447979a81d48..4aea0edf4e7e 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -675,7 +675,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) DBG_TESTSOLARMUTEX(); if(mpObj.is() && rPropSet.AreThereOwnUsrAnys() && mpModel) { - SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END, 0); + SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END); Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY ); SvxItemPropertySet_ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index f0bc6bc25c22..6b749df4bb17 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -200,9 +200,7 @@ sal_Bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) std::vector<sal_uInt16> aClearWhichIds; // restoring all paragraph list attributes { - SfxItemSet aListAttrSet( pDoc->GetAttrPool(), - RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1, - 0 ); + SfxItemSet aListAttrSet( pDoc->GetAttrPool(), RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1 ); aListAttrSet.Set( *pSet ); if ( aListAttrSet.Count() ) { diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 4ddf95ed96b0..878223cfe89e 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -423,9 +423,7 @@ SwDoc::SwDoc() // pass empty item set containing the paragraph's list attributes // as ignorable items to the stype manager. { - SfxItemSet aIgnorableParagraphItems( GetAttrPool(), - RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1, - 0 ); + SfxItemSet aIgnorableParagraphItems( GetAttrPool(), RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1); pStyleAccess = createStyleManager( &aIgnorableParagraphItems ); } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index c51a601549a1..51016e29eee3 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -838,8 +838,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (pFmt) { const SfxItemSet& rOldAttrSet = pFmt->GetAttrSet(); - pItemSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), - pEntry->nWID, pEntry->nWID, 0)); + pItemSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), pEntry->nWID, pEntry->nWID)); pItemSet->Put(rOldAttrSet); m_rPropSet.setPropertyValue(*pEntry, pValues[nProperty], *pItemSet); @@ -1607,8 +1606,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (pFmt) { const SfxItemSet& rOldAttrSet = pFmt->GetAttrSet(); - pNewAttrSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), - pEntry->nWID, pEntry->nWID, 0)); + pNewAttrSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), pEntry->nWID, pEntry->nWID)); pNewAttrSet->ClearItem(pEntry->nWID); } else diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 315990ac14e7..a36cc9ce32d5 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1652,9 +1652,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) // make a selection from aStartPam to a EndPam SwSelBoxes aBoxes; - SfxItemSet aFrameItemSet(m_pImpl->m_pDoc->GetAttrPool(), - RES_FRMATR_BEGIN, RES_FRMATR_END-1, - 0 ); + SfxItemSet aFrameItemSet(m_pImpl->m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1); // If there is no content in the frame the shape is in // it gets deleted in the DelFullPara call below, // In this case insert a tmp text node ( we delete it later ) diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index f94c1231294f..c706424a9196 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -1156,9 +1156,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) aDistLR.SetRight((sal_uInt16)rBox.GetDistance(BOX_LINE_RIGHT)); //add the border distance of the paragraph - SfxItemSet aCoreSet1( GetPool(), - RES_BOX, RES_BOX, - 0 ); + SfxItemSet aCoreSet1( GetPool(), RES_BOX, RES_BOX ); rSh.GetCurAttr( aCoreSet1 ); const SvxBoxItem& rParaBox = (const SvxBoxItem&)aCoreSet1.Get(RES_BOX); aDistLR.SetLeft(aDistLR.GetLeft() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_LEFT )); |