diff options
author | Christian Lippka <christian.lippka@oracle.com> | 2010-08-26 21:50:11 +0200 |
---|---|---|
committer | Christian Lippka <christian.lippka@oracle.com> | 2010-08-26 21:50:11 +0200 |
commit | 0cd40f9bffa9fa97bd44a7a2e43e40f11af1b2db (patch) | |
tree | 992156778fb7cbd0400e52304a0ea55035c184d0 /editeng/source/uno/unoipset.cxx | |
parent | 27d42b733ff4809ae46b8fa7070c3a4a8a53fb2c (diff) |
impress200: #i114089# clear user any after they are applied to the shape
Diffstat (limited to 'editeng/source/uno/unoipset.cxx')
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 39ab3507c5d3..6ba232010390 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -71,15 +71,7 @@ SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, Sfx //---------------------------------------------------------------------- SvxItemPropertySet::~SvxItemPropertySet() { -/* - if(pItemPool) - delete pItemPool; - pItemPool = NULL; -*/ - - if(pCombiList) - delete pCombiList; - pCombiList = NULL; + ClearAllUsrAny(); } //---------------------------------------------------------------------- @@ -111,6 +103,17 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) pCombiList->Insert(pNew); } +//---------------------------------------------------------------------- + +void SvxItemPropertySet::ClearAllUsrAny() +{ + if(pCombiList) + delete pCombiList; + pCombiList = NULL; +} + +//---------------------------------------------------------------------- + sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { sal_Bool bConvert = sal_True; // the default is that all metric items must be converted |