diff options
| author | Release Engineers <releng@openoffice.org> | 2009-06-08 14:12:46 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-06-08 14:12:46 +0000 |
| commit | 76731ecf3a825dd5d244d7754b73f3be93ea274b (patch) | |
| tree | 71ced856e690332e10f74a496822b9552aae3a92 | |
| parent | 771bbe5ff028417f66b34bdd7c30cfa3e5ccc653 (diff) | |
#i10000# build fix
| -rw-r--r-- | svx/inc/svx/unotext.hxx | 2 | ||||
| -rw-r--r-- | svx/source/unoedit/unotext.cxx | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx index 4fe716c259ff..1a5b446be144 100644 --- a/svx/inc/svx/unotext.hxx +++ b/svx/inc/svx/unotext.hxx @@ -283,7 +283,7 @@ protected: virtual sal_Bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); virtual void SAL_CALL _setPropertyToDefault( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertyMap* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); + virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); void SetEditSource( SvxEditSource* _pEditSource ) throw(); virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(::com::sun::star::beans::UnknownPropertyException ); diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx index daa7744bb8c8..4a550fb8537d 100644 --- a/svx/source/unoedit/unotext.cxx +++ b/svx/source/unoedit/unotext.cxx @@ -1220,8 +1220,8 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa if( pForwarder ) { - const SfxItemPropertyMap* pMap = SfxItemPropertyMap::GetByName(maPropSet.getPropertyMap(), PropertyName ); - if( pMap ) + const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( PropertyName ); + if ( pMap ) { CheckSelection( maSelection, mpEditSource->GetTextForwarder() ); _setPropertyToDefault( pForwarder, pMap, nPara ); @@ -1232,7 +1232,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa throw beans::UnknownPropertyException(); } -void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertyMap* pMap, sal_Int32 nPara ) +void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { do @@ -1329,9 +1329,12 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault( ) throw (uno::Run if( pForwarder ) { - for( const SfxItemPropertyMap* pMap = maPropSet.getPropertyMap(); pMap->pName; pMap++ ) + PropertyEntryVector_t aEntries = mpPropSet->getPropertyMap()->getPropertyEntries(); + PropertyEntryVector_t::const_iterator aIt = aEntries.begin(); + while( aIt != aEntries.end() ) { - _setPropertyToDefault( pForwarder, pMap, -1 ); + _setPropertyToDefault( pForwarder, &(*aIt), -1 ); + ++aIt; } } } |