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 /sw | |
parent | 14d0096300685ec508b3b54d773db7767ce3b429 (diff) |
kill va_args abuse for SfxItemSet
Change-Id: I200addfdf551f1b8437b704c481d397c53440dcd
Diffstat (limited to 'sw')
-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 |
5 files changed, 6 insertions, 16 deletions
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 )); |