summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/AxisHelper.cxx8
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx26
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx5
3 files changed, 12 insertions, 27 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 81c788846241..1b484801d030 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -444,8 +444,7 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
}
void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
- , const Reference< XDiagram >& xDiagram
- , const Reference< uno::XComponentContext >& /*xContext*/ )
+ , const Reference< XDiagram >& xDiagram )
{
if( !xDiagram.is() )
return;
@@ -1021,8 +1020,7 @@ bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
, const Sequence< sal_Bool >& rOldExistenceList
- , const Sequence< sal_Bool >& rNewExistenceList
- , const Reference< uno::XComponentContext >& xContext )
+ , const Sequence< sal_Bool >& rNewExistenceList )
{
bool bChanged = false;
for(sal_Int32 nN=0;nN<6;nN++)
@@ -1031,7 +1029,7 @@ bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
{
bChanged = true;
if(rNewExistenceList[nN])
- AxisHelper::showGrid( nN%3, 0, nN<3, xDiagram, xContext );
+ AxisHelper::showGrid( nN%3, 0, nN<3, xDiagram );
else
AxisHelper::hideGrid( nN%3, 0, nN<3, xDiagram );
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index f81722c5009d..d99a21983e60 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -364,7 +364,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
Reference< XDiagram > xDiagram( xObject, uno::UNO_QUERY );
if( xDiagram.is() )
{
- return createClassifiedIdentifierForParticle( createParticleForDiagram( xDiagram, rModel ) );
+ return createClassifiedIdentifierForParticle( createParticleForDiagram() );
}
//todo
@@ -446,7 +446,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
Reference< XDiagram > xDiagram( xObject, uno::UNO_QUERY );
if( xDiagram.is() )
{
- return createClassifiedIdentifierForParticle( createParticleForDiagram( xDiagram, xChartModel ) );
+ return createClassifiedIdentifierForParticle( createParticleForDiagram() );
}
//todo
@@ -506,19 +506,9 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
return aRet.makeStringAndClear();
}
-OUString ObjectIdentifier::createParticleForDiagram(
- const Reference< XDiagram >& /*xDiagram*/
- , ChartModel& /*xChartModel*/ )
+OUString ObjectIdentifier::createParticleForDiagram()
{
- //todo: if more than one diagram is implemeted, add the correct diagram index here
- return OUString("D=0");
-}
-
-OUString ObjectIdentifier::createParticleForDiagram(
- const Reference< XDiagram >& /*xDiagram*/
- , const Reference< frame::XModel >& /*xChartModel*/ )
-{
- //todo: if more than one diagram is implemeted, add the correct diagram index here
+ //TODO: if more than one diagram is implemented, add the correct diagram index here
return OUString("D=0");
}
@@ -539,7 +529,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
Reference< XCoordinateSystem > xCurrentCooSys( aCooSysList[nCooSysIndex] );
if( xCooSys == xCurrentCooSys )
{
- aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, rModel );
+ aRet = ObjectIdentifier::createParticleForDiagram();
aRet.append(":CS=");
aRet.append( OUString::number( nCooSysIndex ) );
break;
@@ -567,7 +557,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
Reference< XCoordinateSystem > xCurrentCooSys( aCooSysList[nCooSysIndex] );
if( xCooSys == xCurrentCooSys )
{
- aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel );
+ aRet = ObjectIdentifier::createParticleForDiagram();
aRet.append(":CS=");
aRet.append( OUString::number( nCooSysIndex ) );
break;
@@ -649,7 +639,7 @@ OUString ObjectIdentifier::createParticleForLegend( ChartModel& rModel )
Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
//todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
- aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, rModel ) );
+ aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_LEGEND ));
aRet.append("=");
@@ -665,7 +655,7 @@ OUString ObjectIdentifier::createParticleForLegend(
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
//todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
- aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel ) );
+ aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_LEGEND ));
aRet.append("=");
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 5fa4a34076e7..3b4d32a7dc02 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -347,7 +347,6 @@ void RegressionCurveHelper::removeMeanValueLine(
uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::addRegressionCurve(
SvxChartRegress eType,
uno::Reference< XRegressionCurveContainer > const & xRegressionCurveContainer,
- const uno::Reference< XComponentContext >& /* xContext */,
const uno::Reference< beans::XPropertySet >& xPropertySource,
const uno::Reference< beans::XPropertySet >& xEquationProperties )
{
@@ -467,14 +466,12 @@ void RegressionCurveHelper::removeEquations(
uno::Reference< XRegressionCurve > RegressionCurveHelper::changeRegressionCurveType(
SvxChartRegress eType,
uno::Reference< XRegressionCurveContainer > const & xRegressionCurveContainer,
- uno::Reference< XRegressionCurve > const & xRegressionCurve,
- const uno::Reference< XComponentContext > & xContext )
+ uno::Reference< XRegressionCurve > const & xRegressionCurve )
{
xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve );
return RegressionCurveHelper::addRegressionCurve(
eType,
xRegressionCurveContainer,
- xContext,
uno::Reference< beans::XPropertySet >( xRegressionCurve, uno::UNO_QUERY ),
xRegressionCurve->getEquationProperties());
}
generated by cgit (git 2.34.1) at 2024-07-18 21:01:59 +0000