diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:37:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:38:30 +0100 |
| commit | 123e2c3e9350463fde38fbcbb522e3d6d8340ee6 (patch) | |
| tree | c0f9350733d93f6a906cfe2f19b5dac66a655283 /editeng/source/uno/unoipset.cxx | |
| parent | Don't hold css::uno::Type instances by pointer (diff) | |
| download | core-123e2c3e9350463fde38fbcbb522e3d6d8340ee6.tar.gz core-123e2c3e9350463fde38fbcbb522e3d6d8340ee6.zip | |
Revert "Don't hold css::uno::Type instances by pointer"
This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...
Change-Id: I50563a00406259bb5d41831e2a2796762450d097
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 fe955ba8d969..ed16db9b4148 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->aType.getTypeClass() == uno::TypeClass_ENUM && + else if ( pMap->pType->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->aType ); + aVal.setValue( &nEnum, *pMap->pType ); } } else @@ -245,13 +245,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } } - if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM && + if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) { sal_Int32 nEnum; aVal >>= nEnum; - aVal.setValue( &nEnum, pMap->aType ); + aVal.setValue( &nEnum, *pMap->pType ); } return aVal; |