diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-22 18:23:36 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-22 18:23:36 +0100 |
| commit | ded7cd73ac5f360cc48a66dffa315894764fb698 (patch) | |
| tree | fe0f990e6586c9836ea562e8b3f22ca3e6ad7677 /editeng | |
| parent | d0d27202a22a88947249be238b23c5a82af94691 (diff) | |
#i107450#: make code more explicit to avoid mistakes
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/unoipset.hxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx index a3ed027e83b7..40c6bbe85158 100644 --- a/editeng/inc/editeng/unoipset.hxx +++ b/editeng/inc/editeng/unoipset.hxx @@ -57,8 +57,8 @@ public: ~SvxItemPropertySet(); // Methoden, die direkt mit dem ItemSet arbeiten - ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent=true, bool bDontConvertNegativeValues=false ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues=false ) const; + ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const; + void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const; // Methoden, die stattdessen Any benutzen ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index e79e351278ff..82c51a440394 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -541,7 +541,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) // muss vorher das alte Item aus dem Dokument geholt werden rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set - mpPropSet->setPropertyValue(pMap, rValue, rNewSet ); + mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false ); } } @@ -712,7 +712,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM default: if(!GetPropertyValueHelper( *((SfxItemSet*)(&rSet)), pMap, rAny, &maSelection, GetEditSource() )) - rAny = mpPropSet->getPropertyValue(pMap, rSet, false ); + rAny = mpPropSet->getPropertyValue(pMap, rSet, true, false ); } } @@ -1329,7 +1329,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp { SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); - return mpPropSet->getPropertyValue(pMap, aSet, false ); + return mpPropSet->getPropertyValue(pMap, aSet, true, false ); } } } |