summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/ControllerLockGuard.cxx4
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx4
-rw-r--r--chart2/source/tools/DiagramHelper.cxx12
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx12
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx3
6 files changed, 23 insertions, 14 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 25054aa2482c..3dbbffbe1544 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -189,7 +189,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
}
else
{
- Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( Reference< XChartDocument >(xChartDoc) ) );
+ Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( *xChartDoc ) );
if( xSource.is() )
{
std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx
index 7719755e9aff..9ae942a5a5ff 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -27,7 +27,7 @@ using ::com::sun::star::uno::Reference;
namespace chart
{
-ControllerLockGuardUNO::ControllerLockGuardUNO( const uno::Reference< frame::XModel >& xModel ) :
+ControllerLockGuardUNO::ControllerLockGuardUNO( const rtl::Reference<::chart::ChartModel>& xModel ) :
mxModel( xModel )
{
mxModel->lockControllers();
@@ -49,7 +49,7 @@ ControllerLockGuard::~ControllerLockGuard()
mrModel.unlockControllers();
}
-ControllerLockHelper::ControllerLockHelper( const Reference< frame::XModel > & xModel ) :
+ControllerLockHelper::ControllerLockHelper( const rtl::Reference<::chart::ChartModel> & xModel ) :
m_xModel( xModel )
{}
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 627d94416d63..851204c70a75 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -450,7 +450,9 @@ void DataSourceHelper::setRangeSegmentation(
if( !xDataSource.is() )
return;
- ControllerLockGuardUNO aCtrlLockGuard( xChartModel );
+ auto pModel = dynamic_cast<ChartModel*>(xChartModel.get());
+ assert(pModel);
+ ControllerLockGuardUNO aCtrlLockGuard( pModel );
xDiagram->setDiagramData( xDataSource, aArguments );
}
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index f7440c8ec1c0..d55ce0873967 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1024,7 +1024,9 @@ void DiagramHelper::switchToDateCategories( const Reference< XChartDocument >& x
{
if(xChartDoc.is())
{
- ControllerLockGuardUNO aCtrlLockGuard( xChartDoc );
+ auto pModel = dynamic_cast<ChartModel*>(xChartDoc.get());
+ assert(pModel);
+ ControllerLockGuardUNO aCtrlLockGuard( pModel );
Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartDoc ) );
if( xCooSys.is() )
@@ -1039,7 +1041,9 @@ void DiagramHelper::switchToTextCategories( const Reference< XChartDocument >& x
{
if(xChartDoc.is())
{
- ControllerLockGuardUNO aCtrlLockGuard( xChartDoc );
+ auto pModel = dynamic_cast<ChartModel*>(xChartDoc.get());
+ assert(pModel);
+ ControllerLockGuardUNO aCtrlLockGuard( pModel );
Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartDoc ) );
if( xCooSys.is() )
@@ -1546,7 +1550,9 @@ static void lcl_ensureRange0to1( double& rValue )
bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >& xChartModel,
const awt::Rectangle& rPosRect /*100th mm*/ )
{
- ControllerLockGuardUNO aCtrlLockGuard( xChartModel );
+ auto pModel = dynamic_cast<ChartModel*>(xChartModel.get());
+ assert(pModel);
+ ControllerLockGuardUNO aCtrlLockGuard( pModel );
bool bChanged = false;
awt::Size aPageSize( ChartModelHelper::getPageSize(xChartModel) );
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index ba9b497dac20..46dfb1d593f8 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -20,6 +20,7 @@
#include <ReferenceSizeProvider.hxx>
#include <RelativeSizeHelper.hxx>
#include <ChartModelHelper.hxx>
+#include <ChartModel.hxx>
#include <DiagramHelper.hxx>
#include <Diagram.hxx>
#include <AxisHelper.hxx>
@@ -42,7 +43,7 @@ namespace chart
ReferenceSizeProvider::ReferenceSizeProvider(
awt::Size aPageSize,
- const Reference< XChartDocument > & xChartDoc ) :
+ const rtl::Reference<::chart::ChartModel> & xChartDoc ) :
m_aPageSize( aPageSize ),
m_xChartDoc( xChartDoc ),
m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES )
@@ -218,14 +219,13 @@ void ReferenceSizeProvider::impl_getAutoResizeFromTitled(
with state NO, AUTO_RESIZE_AMBIGUOUS is returned.
*/
ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState(
- const Reference< XChartDocument > & xChartDoc )
+ const rtl::Reference<::chart::ChartModel> & xChartDoc )
{
AutoResizeState eResult = AUTO_RESIZE_UNKNOWN;
// Main Title
- Reference< XTitled > xDocTitled( xChartDoc, uno::UNO_QUERY );
- if( xDocTitled.is())
- impl_getAutoResizeFromTitled( xDocTitled, eResult );
+ if( xChartDoc.is())
+ impl_getAutoResizeFromTitled( xChartDoc, eResult );
if( eResult == AUTO_RESIZE_AMBIGUOUS )
return eResult;
@@ -315,7 +315,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
m_bUseAutoScale = (eNewState == AUTO_RESIZE_YES);
// Main Title
- impl_setValuesAtTitled( Reference< XTitled >( m_xChartDoc, uno::UNO_QUERY ));
+ impl_setValuesAtTitled( m_xChartDoc );
// diagram is needed by the rest of the objects
Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( m_xChartDoc );
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4c7a1e53394b..52ab1e1785e9 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -29,6 +29,7 @@
#include "RegressionCurveModel.hxx"
#include <ChartTypeHelper.hxx>
#include <ChartType.hxx>
+#include <ChartModel.hxx>
#include <ChartModelHelper.hxx>
#include <ResId.hxx>
#include <strings.hrc>
@@ -229,7 +230,7 @@ void RegressionCurveHelper::initializeCurveCalculator(
void RegressionCurveHelper::initializeCurveCalculator(
const Reference< XRegressionCurveCalculator > & xOutCurveCalculator,
const Reference< XDataSeries > & xSeries,
- const Reference< frame::XModel > & xModel )
+ const rtl::Reference<::chart::ChartModel> & xModel )
{
sal_Int32 nAxisType = ChartTypeHelper::getAxisType(
ChartModelHelper::getChartTypeOfSeries( xModel, xSeries ), 0 ); // x-axis
generated by cgit (git 2.34.1) at 2024-08-15 11:49:14 +0000