diff options
Diffstat (limited to 'chart2/source/controller/main/ChartModelClone.cxx')
| -rw-r--r-- | chart2/source/controller/main/ChartModelClone.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index dfb089d566e8..153a37d7f982 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -19,8 +19,8 @@ #include "ChartModelClone.hxx" #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <ControllerLockGuard.hxx> +#include <DataSource.hxx> #include <DataSourceHelper.hxx> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> @@ -28,14 +28,10 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/chart2/XTitled.hpp> -#include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <comphelper/property.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace chart { @@ -51,10 +47,6 @@ namespace chart using ::com::sun::star::chart2::XInternalDataProvider; using ::com::sun::star::chart2::XAnyDescriptionAccess; using ::com::sun::star::view::XSelectionSupplier; - using ::com::sun::star::lang::XComponent; - using ::com::sun::star::chart2::XTitled; - using ::com::sun::star::util::XModifiable; - using ::com::sun::star::chart2::data::XDataSource; using ::com::sun::star::chart2::data::XLabeledDataSequence; // = helper @@ -179,7 +171,7 @@ namespace chart ControllerLockGuardUNO aLockedControllers( i_model ); // propagate the correct flag for plotting of hidden values to the data provider and all used sequences - ChartModelHelper::setIncludeHiddenCells(ChartModelHelper::isIncludeHiddenCells( i_modelToCopyFrom ), *i_model); + i_model->setIncludeHiddenCells(i_modelToCopyFrom->isIncludeHiddenCells()); // diagram i_model->setFirstDiagram( i_modelToCopyFrom->getFirstDiagram() ); @@ -201,7 +193,7 @@ namespace chart if ( i_model->hasInternalDataProvider() ) { Reference< XInternalDataProvider > xNewDataProvider( i_model->getDataProvider(), UNO_QUERY ); - Reference< XDataSource > xUsedData( DataSourceHelper::getUsedData( *i_model ) ); + rtl::Reference< DataSource > xUsedData = DataSourceHelper::getUsedData( *i_model ); if ( xUsedData.is() && xNewDataProvider.is() ) { const Sequence< Reference< XLabeledDataSequence > > aData( xUsedData->getDataSequences() ); |