diff options
author | Christian Lippka <cl@openoffice.org> | 2001-02-01 17:53:42 +0000 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2001-02-01 17:53:42 +0000 |
commit | f33a043669e1d002a43b2738e1fdfe0d5979f400 (patch) | |
tree | 7370e9f20d3aa99c80aa5af698dc3ab809b2b874 /svx/source/unodraw/unoipset.cxx | |
parent | c314e48d85144bb25a139419885f4375ccd1e1ba (diff) |
#82008# get item from pool if its not in parent
Diffstat (limited to 'svx/source/unodraw/unoipset.cxx')
-rw-r--r-- | svx/source/unodraw/unoipset.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx index f42ef7ba8727..1ea567ca7be3 100644 --- a/svx/source/unodraw/unoipset.cxx +++ b/svx/source/unodraw/unoipset.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoipset.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2000-10-30 11:14:27 $ + * last change: $Author: cl $ $Date: 2001-02-01 18:53:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,7 +258,19 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertyMap* pMap, const SfxItemState eState = rSet.GetItemState( pMap->nWID, sal_True, &pItem ); // UnoAny in item-Wert stecken - if(eState >= SFX_ITEM_DEFAULT && pItem) + if(eState < SFX_ITEM_DEFAULT || pItem == NULL) + { + SfxItemPool* pPool = rSet.GetPool(); + if( pPool == NULL ) + { + DBG_ERROR( "No default item and no pool?" ); + return; + } + + pItem = pPool->GetPoolDefaultItem( pMap->nWID ); + } + + if( pItem ) { pNewItem = pItem->Clone(); if( pNewItem->PutValue( rVal, pMap->nMemberId ) ) |