diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 18:16:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 18:19:43 +0100 |
| commit | 0d5c8dff302c26cd916824434873e3286959435a (patch) | |
| tree | abe6d183bc72903106184dea27baf9dd89a1c6f1 /sw | |
| parent | d17c9ee705f9885f61f84dc2d244c4d0c0c39928 (diff) | |
Clean up SfxItemSet::Put
* Make inherited overloads visible via "using" in SfxAllItemSet.
* The overload with SfxItemSet argument:
** need not be virtual (verified by temporarily marking it SAL_FINAL);
** should apparently return bool.
Change-Id: I5c57ec3d757d3d32a3e23be12964e7ebb81e6211
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/attr/format.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/attr/swatrset.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 025faf79a9cc..277957f2564b 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -447,7 +447,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet ) ( RES_GRFFMTCOLL == nFmtWhich || RES_TXTFMTCOLL == nFmtWhich ) ) ) { - if( ( bRet = (0 != aSet.Put( rSet ))) ) + if( ( bRet = aSet.Put( rSet )) ) aSet.SetModifyAtAttr( this ); // #i71574# if ( nFmtWhich == RES_TXTFMTCOLL ) diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 9f41cd6a7df0..083cd2ac85fd 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -127,7 +127,7 @@ bool SwAttrSet::Put_BC( const SfxItemSet& rSet, { pNewSet = pNew; pOldSet = pOld; - bool nRet = 0 != SfxItemSet::Put( rSet ); + bool nRet = SfxItemSet::Put( rSet ); pOldSet = pNewSet = 0; return nRet; } diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index e2f6ecab9383..e0710b31e589 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -139,7 +139,7 @@ const SfxPoolItem* Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, return pRet; } -int Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rNode, +bool Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rNode, const SfxItemSet& rSet ) { SwAttrSet aNewSet( (SwAttrSet&)*mrpAttrSet ); @@ -152,7 +152,7 @@ int Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rNo pStyleNames->Put( aNewSet ); } - const int nRet = aNewSet.Put( rSet ); + const bool nRet = aNewSet.Put( rSet ); // #i76273# Robust if ( pStyleNames ) @@ -1437,7 +1437,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet ) SFX_ITEM_SET != rSet.GetItemState( RES_PARATR_NUMRULE, sal_False ) ) ) { // Some special treatment for Attributes - bRet = 0 != AttrSetHandleHelper::Put( mpAttrSet, *this, rSet ); + bRet = AttrSetHandleHelper::Put( mpAttrSet, *this, rSet ); } else { |