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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 14 | ||||
| -rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 68811c168672..bcb9960de4e4 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1332,12 +1332,12 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) { try { - ::comphelper::PropertyMapEntry aInfoMap[] = + ::comphelper::PropertyMapEntry const aInfoMap[] = { - { "Class", sizeof("Class")-1, 0, - &::getCppuType((OUString*)0), + { "Class", 0, + ::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, 0}, - { NULL, 0, 0, NULL, 0, 0 } + {} }; Reference< XPropertySet > xConvPropSet( ::comphelper::GenericPropertySet_CreateInstance( @@ -2160,10 +2160,10 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) if( ! (getExportFlags() & EXPORT_OASIS) && bIsChart ) { - static ::comphelper::PropertyMapEntry aInfoMap[] = + static ::comphelper::PropertyMapEntry const aInfoMap[] = { - { "ExportTableNumberList", 21, 0, &::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0}, - { NULL, 0, 0, NULL, 0, 0 } + { "ExportTableNumberList", 0, ::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0}, + {} }; Reference< XPropertySet > xInfoProp( ::comphelper::GenericPropertySet_CreateInstance( diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 4a2d63ca0cda..e664fc5c59a0 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -78,12 +78,12 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) uno::Reference< uno::XComponentContext > xContext = getComponentContext(); try { - ::comphelper::PropertyMapEntry aInfoMap[] = + ::comphelper::PropertyMapEntry const aInfoMap[] = { - { "Class", sizeof("Class")-1, 0, - &::getCppuType((OUString*)0), + { "Class", 0, + ::getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0}, - { NULL, 0, 0, NULL, 0, 0 } + {} }; uno::Reference< beans::XPropertySet > xConvPropSet( ::comphelper::GenericPropertySet_CreateInstance( |