mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill va_args abuse for SfxItemSet

Browse Source 
Change-Id: I200addfdf551f1b8437b704c481d397c53440dcd
This commit is contained in:
Bjoern Michaelsen 2012-08-04 15:17:03 +02:00
parent 14d0096300
commit 1af0e36fb6
9 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sc/source/core/data/stlsheet.cxx
View File

@ -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;

2
sfx2/source/control/bindings.cxx
View File

@ -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;

2
svx/source/sdr/properties/defaultproperties.cxx
View File

@ -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());

2
svx/source/unodraw/unoshape.cxx
View File

@ -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() );

4
sw/source/core/doc/docfmt.cxx
View File

@ -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() )
{

4
sw/source/core/doc/docnew.cxx
View File

@ -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 );
}

6
sw/source/core/unocore/unosect.cxx
View File

@ -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

4
sw/source/core/unocore/unotext.cxx
View File

@ -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 )

4
sw/source/ui/uiview/viewtab.cxx
View File

@ -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 ));