diff options
Diffstat (limited to 'chart2/source/model/filter/XMLFilter.cxx')
| -rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 8d8e8e8a1920..8c563b1f1f0a 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -61,6 +61,7 @@ using ::osl::MutexGuard; namespace { #define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x +#define MAP_LEN(x) x, sizeof(x) - 1 LOCAL_CONST_STR( sXML_metaStreamName, "meta.xml"); LOCAL_CONST_STR( sXML_styleStreamName, "styles.xml" ); @@ -339,28 +340,28 @@ sal_Int32 XMLFilter::impl_Import( // create XPropertySet with extra informatio for the filter /** property map for import info set */ - comphelper::PropertyMapEntry const aImportInfoMap[] = + comphelper::PropertyMapEntry aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { "ProgressRange", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { "ProgressMax", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { "ProgressCurrent", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { "PrivateData", 0, - ::getCppuType( (Reference<XInterface> *)0 ), + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "PrivateData" ), 0, + &::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { "BaseURI", 0, - ::getCppuType( (OUString *)0 ), + { MAP_LEN( "BaseURI" ), 0, + &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamRelPath", 0, - ::getCppuType( (OUString *)0 ), + { MAP_LEN( "StreamRelPath" ), 0, + &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamName", 0, - ::getCppuType( (OUString *)0 ), + { MAP_LEN( "StreamName" ), 0, + &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { "BuildId", 0, - ::getCppuType( (OUString *)0 ), + { MAP_LEN( "BuildId" ), 0, + &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - {} + { NULL, 0, 0, NULL, 0, 0 } }; uno::Reference< beans::XPropertySet > xImportInfo( comphelper::GenericPropertySet_CreateInstance( @@ -613,14 +614,14 @@ sal_Int32 XMLFilter::impl_Export( m_xContext, xStorage ); // property map for export info set - comphelper::PropertyMapEntry const aExportInfoMap[] = + comphelper::PropertyMapEntry aExportInfoMap[] = { - { "UsePrettyPrinting", 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, - { "BaseURI", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamRelPath", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "StreamName", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { "ExportTableNumberList", 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, - {} + { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { NULL, 0, 0, NULL, 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet = |