diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-11-29 20:48:11 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-11-29 21:24:20 +0100 |
commit | 90227b15f095d706795a86564d716a5dbcf2c7e2 (patch) | |
tree | 6831d9098411dedfcf251f87abd1535b64cb681a /chart2 | |
parent | 73f509f3b988ea05afdc3515ba79b6019edaf590 (diff) |
chart2: replace use of deprecated UserDefinedAttributeSupplier
... with UserDefinedAttributesSupplier
Change-Id: Ib289aaae114d89238a665d0a58eda6fa8d0c482b
Diffstat (limited to 'chart2')
15 files changed, 24 insertions, 24 deletions
diff --git a/chart2/qa/unoapi/knownissues.xcl b/chart2/qa/unoapi/knownissues.xcl index 9192dc6ed88d..8321f45d00e8 100644 --- a/chart2/qa/unoapi/knownissues.xcl +++ b/chart2/qa/unoapi/knownissues.xcl @@ -42,15 +42,15 @@ sch.ChartLegend::com::sun::star::drawing::XShape sch.ChartTitle::com::sun::star::drawing::XShape #i78867 -sch.ChXChartDocument::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChXChartAxis::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChXDiagram::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChartArea::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChartGrid::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChartLegend::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChartLine::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChartTitle::com::sun::star::xml::UserDefinedAttributeSupplier -sch.ChXDataPoint::com::sun::star::xml::UserDefinedAttributeSupplier +sch.ChXChartDocument::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChXChartAxis::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChXDiagram::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChartArea::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChartGrid::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChartLegend::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChartLine::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChartTitle::com::sun::star::xml::UserDefinedAttributesSupplier +sch.ChXDataPoint::com::sun::star::xml::UserDefinedAttributesSupplier #i83865 sch.ChXDataPoint::com::sun::star::drawing::LineProperties diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 9c4f6b0c3dc2..8fee82b26907 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -183,7 +183,7 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() Sequence< ::rtl::OUString > AreaWrapper::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; aServices[ 2 ] = "com.sun.star.drawing.FillProperties"; aServices[ 3 ] = "com.sun.star.drawing.LineProperties"; diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 178a56ecff2c..c5e416cb8b66 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -681,7 +681,7 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); aServices[ 0 ] = "com.sun.star.chart.ChartAxis"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 2 ] = "com.sun.star.style.CharacterProperties"; return aServices; diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 034eb4763d04..16799327c998 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1560,7 +1560,7 @@ uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_ uno::Sequence< ::rtl::OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartDocument"; aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 3 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index c29546dca2de..4242c2e1f892 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -862,7 +862,7 @@ uno::Sequence< ::rtl::OUString > DataSeriesPointWrapper::getSupportedServiceName uno::Sequence< ::rtl::OUString > aServices( 7 ); aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties"; aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 3 ] = "com.sun.star.beans.PropertySet"; aServices[ 4 ] = "com.sun.star.drawing.FillProperties"; aServices[ 5 ] = "com.sun.star.drawing.LineProperties"; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 9d970b5eade9..97d49ee05c1e 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -2066,7 +2066,7 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 8 ); aServices[ 0 ] = "com.sun.star.chart.Diagram"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 2 ] = "com.sun.star.chart.StackableDiagram"; aServices[ 3 ] = "com.sun.star.chart.ChartAxisXSupplier"; aServices[ 4 ] = "com.sun.star.chart.ChartAxisYSupplier"; diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 1a7acd3ddac7..07e8a958388f 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -186,7 +186,7 @@ Sequence< OUString > GridWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartGrid"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; aServices[ 3 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 7d63a82303b6..eec61f2aa83e 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -436,7 +436,7 @@ Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static() Sequence< ::rtl::OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartLegend"; aServices[ 1 ] = "com.sun.star.drawing.Shape"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 3 ] = "com.sun.star.style.CharacterProperties"; return aServices; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 9c927ace7aef..19a06c237337 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -419,7 +419,7 @@ Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); aServices[ 0 ] = "com.sun.star.chart.ChartLine"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; return aServices; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 03fa88a2d14f..fd25e332e026 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -533,7 +533,7 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static() Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartTitle"; aServices[ 1 ] = "com.sun.star.drawing.Shape"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 3 ] = "com.sun.star.style.CharacterProperties"; return aServices; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 86b2362d8a51..937cb83aeef2 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -383,7 +383,7 @@ Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static() aServices[ 0 ] = ::rtl::OUString("com.sun.star.chart.ChartArea"); aServices[ 1 ] = ::rtl::OUString("com.sun.star.drawing.LineProperties"); aServices[ 2 ] = ::rtl::OUString("com.sun.star.drawing.FillProperties"); - aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributeSupplier"); + aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributesSupplier"); return aServices; } diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index f8d8243c69e3..8c4b53a7da99 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -166,7 +166,7 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributeSupplier"; + aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; aServices[ 1 ] = "com.sun.star.drawing.FillProperties"; aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; aServices[ 3 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component index 45733588475f..e800bed57c75 100644 --- a/chart2/source/controller/chartcontroller.component +++ b/chart2/source/controller/chartcontroller.component @@ -30,7 +30,7 @@ <service name="com.sun.star.beans.PropertySet"/> <service name="com.sun.star.chart.ChartDocument"/> <service name="com.sun.star.chart2.ChartDocumentWrapper"/> - <service name="com.sun.star.xml.UserDefinedAttributeSupplier"/> + <service name="com.sun.star.xml.UserDefinedAttributesSupplier"/> </implementation> <implementation name="com.sun.star.comp.chart2.ChartFrameLoader"> <service name="com.sun.star.frame.SynchronousFrameLoader"/> diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index 893e123c7e2f..9c73e5fa1f25 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -29,7 +29,7 @@ namespace chart { -// implements service com.sun.star.xml.UserDefinedAttributeSupplier +// implements service com.sun.star.xml.UserDefinedAttributesSupplier class OOO_DLLPUBLIC_CHARTTOOLS UserDefinedProperties { public: @@ -40,7 +40,7 @@ public: PROP_XML_USERDEF_CHART = FAST_PROPERTY_ID_START_USERDEF_PROP, PROP_XML_USERDEF_TEXT, PROP_XML_USERDEF_PARA, - // com.sun.star.xml.UserDefinedAttributeSupplier + // com.sun.star.xml.UserDefinedAttributesSupplier // UserDefined attributes in the other properties-sections. (as long as // there is no reliable mechanism, properties may move between the // sections) diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 4345cf05bba3..69ad99db5b6b 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -50,7 +50,7 @@ void UserDefinedProperties::AddPropertiesToVector( ::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); - // UserDefinedAttributeSupplier + // UserDefinedAttributesSupplier // ---------------------------- rOutProperties.push_back( Property( C2U( "UserDefinedAttributes" ), |