diff options
| author | obo <obo@openoffice.org> | 2010-09-14 07:53:51 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-09-14 07:53:51 +0200 |
| commit | 3c2516682b1314edb6fa323b16a01cf6f25693f3 (patch) | |
| tree | 965dcbc9ba5a8ed691a0b079a5696015701d3702 /editeng/source | |
| parent | f39adb3c348cbbd8dece7f60f88a2f7abeb94fa8 (diff) | |
| parent | 0cd40f9bffa9fa97bd44a7a2e43e40f11af1b2db (diff) | |
CWS-TOOLING: integrate CWS impress200
Diffstat (limited to 'editeng/source')
| -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 |