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

make SfxItemSet with SAL_WARN_UNUSED

Browse Source 
Change-Id: Ia74ca329d8438f614169031acfbe0406faf7c281
Reviewed-on: https://gerrit.libreoffice.org/33268
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-01-18 16:04:17 +02:00
parent 2da34e265d
commit afaa10da25
7 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/main/ShapeController.cxx
View File

@ -303,8 +303,6 @@ void ShapeController::executeDispatch_FormatArea()
pFact->CreateSvxAreaTabDialog( pParent, &aAttr, &pDrawModelWrapper->getSdrModel(), true ) ); pFact->CreateSvxAreaTabDialog( pParent, &aAttr, &pDrawModelWrapper->getSdrModel(), true ) );
if ( pDlg.get() ) if ( pDlg.get() )
{ {
SfxItemPool& rItemPool = pDrawViewWrapper->GetModel()->GetItemPool();
SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(), rItemPool.GetLastWhich() );
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
{ {
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();

2
filter/source/msfilter/svdfppt.cxx
View File

@ -7423,7 +7423,6 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
{//vertical writing {//vertical writing
xPropSet->setPropertyValue( "TextWritingMode" , Any( css::text::WritingMode_TB_RL ) ); xPropSet->setPropertyValue( "TextWritingMode" , Any( css::text::WritingMode_TB_RL ) );
} }
SfxItemSet aSet( pObj->GetMergedItemSet() );
drawing::FillStyle eFillStyle(static_cast<const XFillStyleItem&>(pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue()); drawing::FillStyle eFillStyle(static_cast<const XFillStyleItem&>(pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
css::drawing::FillStyle eFS( css::drawing::FillStyle_NONE ); css::drawing::FillStyle eFS( css::drawing::FillStyle_NONE );
switch( eFillStyle ) switch( eFillStyle )
@ -7503,7 +7502,6 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
{ {
try try
{ {
SfxItemSet aSet( pLine->GetMergedItemSet() );
drawing::LineStyle eLineStyle(static_cast<const XLineStyleItem&>(pLine->GetMergedItem( XATTR_LINESTYLE )).GetValue()); drawing::LineStyle eLineStyle(static_cast<const XLineStyleItem&>(pLine->GetMergedItem( XATTR_LINESTYLE )).GetValue());
css::table::BorderLine2 aBorderLine; css::table::BorderLine2 aBorderLine;
switch( eLineStyle ) switch( eLineStyle )

2
include/svl/itemset.hxx
View File

@ -31,7 +31,7 @@ class SvStream;
typedef std::map<sal_uInt16, SfxPoolItem const *> SfxItemMap; typedef std::map<sal_uInt16, SfxPoolItem const *> SfxItemMap;
class SVL_DLLPUBLIC SfxItemSet class SAL_WARN_UNUSED SVL_DLLPUBLIC SfxItemSet
{ {
friend class SfxItemIter; friend class SfxItemIter;

1
sd/source/core/drawdoc.cxx
View File

@ -301,7 +301,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
// Set the StyleSheetPool for HitTestOutliner. // Set the StyleSheetPool for HitTestOutliner.
// The link to the StyleRequest handler of the document is set later, in // The link to the StyleRequest handler of the document is set later, in
// NewOrLoadCompleted, because only then do all the templates exist. // NewOrLoadCompleted, because only then do all the templates exist.
SfxItemSet aSet2( pHitTestOutliner->GetEmptyItemSet() );
pHitTestOutliner->SetStyleSheetPool( static_cast<SfxStyleSheetPool*>(GetStyleSheetPool()) ); pHitTestOutliner->SetStyleSheetPool( static_cast<SfxStyleSheetPool*>(GetStyleSheetPool()) );
SetCalcFieldValueHdl( pHitTestOutliner ); SetCalcFieldValueHdl( pHitTestOutliner );

1
sd/source/ui/func/futempl.cxx
View File

@ -299,7 +299,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
ScopedVclPtr<SfxAbstractTabDialog> pPresDlg; ScopedVclPtr<SfxAbstractTabDialog> pPresDlg;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false; bool bOldDocInOtherLanguage = false;
SfxItemSet aOriSet( pStyleSheet->GetItemSet() );
SfxStyleFamily eFamily = pStyleSheet->GetFamily(); SfxStyleFamily eFamily = pStyleSheet->GetFamily();

5
svl/source/items/itemprop.cxx
View File

@ -234,11 +234,6 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem ); SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
if (SfxItemState::SET != eState && SfxItemPool::IsWhich(rEntry.nWID)) if (SfxItemState::SET != eState && SfxItemPool::IsWhich(rEntry.nWID))
pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID); pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
//maybe there's another way to find an Item
if(eState < SfxItemState::DEFAULT)
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
}
if(!pNewItem && pItem) if(!pNewItem && pItem)
{ {
pNewItem.reset(pItem->Clone()); pNewItem.reset(pItem->Clone());

4
sw/source/uibase/shells/annotsh.cxx
View File

@ -893,8 +893,6 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
return; return;
OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView(); OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
SfxItemSet aEditAttr(pOLV->GetAttribs());
SfxItemSet aNewAttr(*aEditAttr.GetPool(), aEditAttr.GetRanges());
long aOldHeight = pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight(); long aOldHeight = pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight();
sal_uInt16 nSlot = rReq.GetSlot(); sal_uInt16 nSlot = rReq.GetSlot();
@ -1229,7 +1227,6 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
return; return;
OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView(); OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
SfxItemSet aEditAttr(pOLV->GetAttribs());
sal_uInt16 nSlot = rReq.GetSlot(); sal_uInt16 nSlot = rReq.GetSlot();
SwWrtShell &rSh = rView.GetWrtShell(); SwWrtShell &rSh = rView.GetWrtShell();
bool bRestoreSelection = false; bool bRestoreSelection = false;
@ -1353,7 +1350,6 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
return; return;
OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView(); OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
SfxItemSet aEditAttr(pOLV->GetAttribs());
SfxWhichIter aIter(rSet); SfxWhichIter aIter(rSet);
sal_uInt16 nWhich = aIter.FirstWhich(); sal_uInt16 nWhich = aIter.FirstWhich();