diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-13 15:30:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-14 09:16:06 +0200 |
commit | 0db25f68ab897953d9ca76ae094cc80e0ad11d34 (patch) | |
tree | 49113132a27fe96ebdcab497c9a2c8de796e54c4 /svx | |
parent | e50b5526e24ff552def8f08d393037d2c020dc29 (diff) |
remove default value from SfxPoolItem::PutValue
more useful to make it explicit.
Specifically, otherwise my defaultvalue clang plugin would want to
remove lots of places that contains #define constants which, while
technically the same as the default value, convey semantic
information which is quite useful.
Change-Id: I918ad5b0e73ba279fa1b1489b62d900339ff71eb
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sxcikitm.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sxmkitm.hxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unomtabl.cxx | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index f215264d3bd2..be018c7fe65f 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -38,7 +38,7 @@ public: SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index ff4f4593c009..2c6b5261d828 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -38,7 +38,7 @@ public: SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index c20f4c6c0661..42042d5b6832 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -817,7 +817,7 @@ void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal) if (pGrabBagItem == NULL) pGrabBagItem = new SfxGrabBagItem; - pGrabBagItem->PutValue(rVal); + pGrabBagItem->PutValue(rVal, 0); SetChanged(); BroadcastObjectChange(); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 4cb4d9520acb..d12392b7f578 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -153,13 +153,13 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const XLineEndItem aEndMarker; aEndMarker.SetName( aName ); - aEndMarker.PutValue( aElement ); + aEndMarker.PutValue( aElement, 0 ); mpInSet->Put( aEndMarker, XATTR_LINEEND ); XLineStartItem aStartMarker; aStartMarker.SetName( aName ); - aStartMarker.PutValue( aElement ); + aStartMarker.PutValue( aElement, 0 ); mpInSet->Put( aStartMarker, XATTR_LINESTART ); } @@ -234,14 +234,14 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const { XLineEndItem aEndMarker; aEndMarker.SetName( aSearchName ); - if( !aEndMarker.PutValue( aElement ) ) + if( !aEndMarker.PutValue( aElement, 0 ) ) throw lang::IllegalArgumentException(); (*aIter)->Put( aEndMarker, XATTR_LINEEND ); XLineStartItem aStartMarker; aStartMarker.SetName( aSearchName ); - aStartMarker.PutValue( aElement ); + aStartMarker.PutValue( aElement, 0 ); (*aIter)->Put( aStartMarker, XATTR_LINESTART ); return; @@ -259,7 +259,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const NameOrIndex *pItem = const_cast<NameOrIndex*>(static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate))); if( pItem && pItem->GetName() == aSearchName ) { - pItem->PutValue( aElement ); + pItem->PutValue( aElement, 0 ); bFound = true; break; } @@ -271,7 +271,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const NameOrIndex *pItem = const_cast<NameOrIndex*>(static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate))); if( pItem && pItem->GetName() == aSearchName ) { - pItem->PutValue( aElement ); + pItem->PutValue( aElement, 0 ); bFound = true; break; } |