From a1e41fc3d18816b25f7d26bf05eb548ec22309aa Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 11 May 2014 10:44:13 +0200 Subject: [PATCH] Fix previous commit (chart2 part) Change-Id: I9d6491f484eb2a8989b7e3594ca2edf702557b12 --- chart2/source/model/filter/XMLFilter.cxx | 20 ++++++++++---------- chart2/source/model/main/ChartModel.cxx | 2 +- chart2/source/tools/ErrorBar.cxx | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 5bbfa396bb96..32f0419f8b22 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -335,23 +335,23 @@ sal_Int32 XMLFilter::impl_Import( comphelper::PropertyMapEntry const aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { OUString("ProgressRange"), 0, ::cppu::UnoType::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressRange"), 0, ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PrivateData"), 0, ::getCppuType( (Reference *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::cppu::UnoType::get()0 ), + ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::cppu::UnoType::get()0 ), + ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::cppu::UnoType::get()0 ), + ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, - ::cppu::UnoType::get()0 ), + ::cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -609,9 +609,9 @@ sal_Int32 XMLFilter::impl_Export( comphelper::PropertyMapEntry const aExportInfoMap[] = { { OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::cppu::UnoType::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BaseURI"), 0, ::cppu::UnoType::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index fd5689d5ee2f..34e8f47e52bb 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -103,7 +103,7 @@ ChartModel::ChartModel(uno::Reference const & xContext) , m_xDataProvider( 0 ) , m_xInternalDataProvider( 0 ) , m_xPageBackground( new PageBackground( m_xContext ) ) - , m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType::get() 0 ), + , m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType::get(), "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) , mnStart(0) , mnEnd(0) diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index eca75fc39fd8..4bf53386effa 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -60,13 +60,13 @@ const SfxItemPropertySet* GetErrorBarPropertySet() {OUString("PositiveError"),2,getCppuType((const double*)0),0,0}, {OUString("NegativeError"),3,getCppuType((const double*)0), 0, 0}, {OUString("PercentageError"),4,getCppuType((const double*)0), 0, 0}, - {OUString("ErrorBarStyle"),5,cppu::UnoType::get()0),0,0}, - {OUString("ErrorBarRangePositive"),6,cppu::UnoType::get()0),0,0}, // read-only for export - {OUString("ErrorBarRangeNegative"),7,cppu::UnoType::get()0),0,0}, // read-only for export + {OUString("ErrorBarStyle"),5,cppu::UnoType::get(),0,0}, + {OUString("ErrorBarRangePositive"),6,cppu::UnoType::get(),0,0}, // read-only for export + {OUString("ErrorBarRangeNegative"),7,cppu::UnoType::get(),0,0}, // read-only for export {OUString("Weight"),8,getCppuType((const double*)0),0,0}, {OUString("LineStyle"),9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0}, {OUString("LineDash"),10,getCppuType((drawing::LineDash*)0),0,0}, - {OUString("LineWidth"),11,cppu::UnoType::get()0),0,0}, + {OUString("LineWidth"),11,cppu::UnoType::get(),0,0}, {OUString("LineColor"),12,getCppuType((com::sun::star::util::Color*)0),0,0}, {OUString("LineTransparence"),13,getCppuType((sal_Int16*)0),0,0}, {OUString("LineJoint"),14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},