diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:16:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:16:51 +0100 |
commit | 90f91088d238469b4a2262c91de3117ba40f5bde (patch) | |
tree | bad912690be028b4242744eed6755b36bb1bcefa /editeng/source/uno/unoipset.cxx | |
parent | 2fa2d39bf3eb2f216e13f6dd2c6c5c35fd19627c (diff) |
Don't hold css::uno::Type instances by pointer
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
Diffstat (limited to 'editeng/source/uno/unoipset.cxx')
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index ed16db9b4148..fe955ba8d969 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -133,13 +133,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* SvxUnoConvertToMM( eMapUnit, aVal ); } } - else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && + else if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) { // convert typeless SfxEnumItem to enum type sal_Int32 nEnum; aVal >>= nEnum; - aVal.setValue( &nEnum, *pMap->pType ); + aVal.setValue( &nEnum, pMap->aType ); } } else @@ -245,13 +245,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } } - if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && + if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) { sal_Int32 nEnum; aVal >>= nEnum; - aVal.setValue( &nEnum, *pMap->pType ); + aVal.setValue( &nEnum, pMap->aType ); } return aVal; |