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 /xmloff | |
| parent | 90f91088d238469b4a2262c91de3117ba40f5bde (diff) | |
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 '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 bcb9960de4e4..68811c168672 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 const aInfoMap[] = + ::comphelper::PropertyMapEntry aInfoMap[] = { - { "Class", 0, - ::getCppuType((OUString*)0), + { "Class", sizeof("Class")-1, 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 const aInfoMap[] = + static ::comphelper::PropertyMapEntry aInfoMap[] = { - { "ExportTableNumberList", 0, ::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0}, - {} + { "ExportTableNumberList", 21, 0, &::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0}, + { NULL, 0, 0, NULL, 0, 0 } }; Reference< XPropertySet > xInfoProp( ::comphelper::GenericPropertySet_CreateInstance( diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index e664fc5c59a0..4a2d63ca0cda 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 const aInfoMap[] = + ::comphelper::PropertyMapEntry aInfoMap[] = { - { "Class", 0, - ::getCppuType((OUString*)0), + { "Class", sizeof("Class")-1, 0, + &::getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0}, - {} + { NULL, 0, 0, NULL, 0, 0 } }; uno::Reference< beans::XPropertySet > xConvPropSet( ::comphelper::GenericPropertySet_CreateInstance( |