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 /include/svl | |
| 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 'include/svl')
| -rw-r--r-- | include/svl/itemprop.hxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 15e15bf76cda..a4d98b4b64f7 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -33,10 +33,9 @@ struct SfxItemPropertyMapEntry { - const char* pName; - sal_uInt16 nNameLen; + OUString aName; sal_uInt16 nWID; - const com::sun::star::uno::Type* pType; + com::sun::star::uno::Type aType; long nFlags; sal_uInt8 nMemberId; @@ -45,22 +44,21 @@ struct SfxItemPropertyMapEntry struct SfxItemPropertySimpleEntry { sal_uInt16 nWID; - const com::sun::star::uno::Type* pType; + com::sun::star::uno::Type aType; long nFlags; sal_uInt8 nMemberId; SfxItemPropertySimpleEntry() : nWID( 0 ) - , pType( 0 ) , nFlags( 0 ) , nMemberId( 0 ) { } - SfxItemPropertySimpleEntry(sal_uInt16 _nWID, const com::sun::star::uno::Type* _pType, + SfxItemPropertySimpleEntry(sal_uInt16 _nWID, com::sun::star::uno::Type const & _rType, long _nFlags, sal_uInt8 _nMemberId) : nWID( _nWID ) - , pType( _pType ) + , aType( _rType ) , nFlags( _nFlags ) , nMemberId( _nMemberId ) { @@ -68,7 +66,7 @@ struct SfxItemPropertySimpleEntry SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) : nWID( pMapEntry->nWID ) - , pType( pMapEntry->pType ) + , aType( pMapEntry->aType ) , nFlags( pMapEntry->nFlags ) , nMemberId( pMapEntry->nMemberId ) { |