diff options
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 67 |
1 files changed, 31 insertions, 36 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 2753b9621537..bd18c7008b70 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -105,59 +105,54 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, // the user. // create XPropertySet with three properties for status indicator - comphelper::PropertyMapEntry aInfoMap[] = + comphelper::PropertyMapEntry const aInfoMap[] = { - { "ProgressRange", sizeof("ProgressRange")-1, 0, - &::getCppuType((sal_Int32*)0), + { "ProgressRange", 0, + ::getCppuType((sal_Int32*)0), beans::PropertyAttribute::MAYBEVOID, 0}, - { "ProgressMax", sizeof("ProgressMax")-1, 0, - &::getCppuType((sal_Int32*)0), + { "ProgressMax", 0, + ::getCppuType((sal_Int32*)0), beans::PropertyAttribute::MAYBEVOID, 0}, - { "ProgressCurrent", sizeof("ProgressCurrent")-1, 0, - &::getCppuType((sal_Int32*)0), + { "ProgressCurrent", 0, + ::getCppuType((sal_Int32*)0), beans::PropertyAttribute::MAYBEVOID, 0}, - { "WrittenNumberStyles", sizeof("WrittenNumberStyles")-1, 0, - &::getCppuType((uno::Sequence<sal_Int32> *)0), + { "WrittenNumberStyles", 0, + ::getCppuType((uno::Sequence<sal_Int32> *)0), beans::PropertyAttribute::MAYBEVOID, 0}, - { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0, - &::getBooleanCppuType(), + { "UsePrettyPrinting", 0, + ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, - { "ShowChanges", sizeof("ShowChanges")-1, 0, - &::getBooleanCppuType(), + { "ShowChanges", 0, + ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "RedlineProtectionKey", sizeof("RedlineProtectionKey")-1, 0, -#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) - new uno::Type(::getCppuType((Sequence<sal_Int8>*)0)), -#else - &::getCppuType((Sequence<sal_Int8>*)0), -#endif + { "RedlineProtectionKey", 0, + ::getCppuType((Sequence<sal_Int8>*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "BaseURI", sizeof("BaseURI")-1, 0, - &::getCppuType( (OUString *)0 ), + { "BaseURI", 0, + ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamRelPath", sizeof("StreamRelPath")-1, 0, - &::getCppuType( (OUString *)0 ), + { "StreamRelPath", 0, + ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamName", sizeof("StreamName")-1, 0, - &::getCppuType( (OUString *)0 ), + { "StreamName", 0, + ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "AutoTextMode", sizeof("AutoTextMode")-1, 0, - &::getBooleanCppuType(), + { "AutoTextMode", 0, + ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StyleNames", sizeof("StyleNames")-1, 0, - &::getCppuType( (Sequence<OUString>*)0 ), + { "StyleNames", 0, + ::getCppuType( (Sequence<OUString>*)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StyleFamilies", sizeof("StyleFamilies")-1, 0, - &::getCppuType( (Sequence<sal_Int32>*)0 ), + { "StyleFamilies", 0, + ::getCppuType( (Sequence<sal_Int32>*)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, // #i69627# - { "OutlineStyleAsNormalListStyle", sizeof("OutlineStyleAsNormalListStyle")-1, 0, - &::getBooleanCppuType(), + { "OutlineStyleAsNormalListStyle", 0, + ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "TargetStorage", sizeof("TargetStorage")-1,0, &embed::XStorage::static_type(), + { "TargetStorage",0, embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - - { NULL, 0, 0, NULL, 0, 0 } + {} }; uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( |