diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-08 10:48:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-15 09:56:01 +0200 |
| commit | f6c759a6e5ead55b857e5d4898aa423b7616e816 (patch) | |
| tree | 793c94be22721662151e26cedb2faff94f6c18e2 /sc | |
| parent | 2fe852386c9450014f84910b0a282d684f40b56a (diff) | |
fdo#46808, Adapt chart2::data::LabeledDataSequence UNO service to new style
Change-Id: I98bfbc8e143b9ad9d486f97380186fde9b4423ec
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlchart.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 8310deb2f7dc..63c9c433a9f5 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -56,6 +56,7 @@ #include <com/sun/star/chart2/TickmarkStyle.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> +#include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/MissingValueTreatment.hpp> @@ -124,6 +125,7 @@ using ::com::sun::star::chart2::data::XDataReceiver; using ::com::sun::star::chart2::data::XDataSequence; using ::com::sun::star::chart2::data::XDataSink; using ::com::sun::star::chart2::data::XLabeledDataSequence; +using ::com::sun::star::chart2::data::LabeledDataSequence; using ::formula::FormulaToken; using ::formula::StackVar; @@ -718,7 +720,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( // create the labeled data sequence, if values or title are present Reference< XLabeledDataSequence > xLabeledSeq; if( xValueSeq.is() || xTitleSeq.is() ) - xLabeledSeq.set( ScfApiHelper::CreateInstance( SERVICE_CHART2_LABELEDDATASEQ ), UNO_QUERY ); + xLabeledSeq.set( LabeledDataSequence::create(comphelper::getProcessComponentContext()), UNO_QUERY ); if( xLabeledSeq.is() ) { if( xValueSeq.is() ) diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 97d3a32bca87..1605f8aba05d 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -57,7 +57,6 @@ class XclRoot; #define SERVICE_CHART2_ERRORBAR "com.sun.star.chart2.ErrorBar" #define SERVICE_CHART2_EXPREGCURVE "com.sun.star.chart2.ExponentialRegressionCurve" #define SERVICE_CHART2_FORMATTEDSTRING "com.sun.star.chart2.FormattedString" -#define SERVICE_CHART2_LABELEDDATASEQ "com.sun.star.chart2.data.LabeledDataSequence" #define SERVICE_CHART2_LEGEND "com.sun.star.chart2.Legend" #define SERVICE_CHART2_LINEARREGCURVE "com.sun.star.chart2.LinearRegressionCurve" #define SERVICE_CHART2_LINEARSCALING "com.sun.star.chart2.LinearScaling" diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 53656cb6c608..5c2dc073949c 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -41,6 +41,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/beans/UnknownPropertyException.hpp> +#include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/table/CellAddress.hpp> @@ -1071,9 +1072,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); if ( xContext.is() ) { - xResult.set( xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.LabeledDataSequence")), - xContext ), uno::UNO_QUERY_THROW ); + xResult.set( chart2::data::LabeledDataSequence::create(xContext), uno::UNO_QUERY_THROW ); } if ( bHasValues ) { |