summaryrefslogtreecommitdiffstats
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-01 08:40:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-01 11:06:26 +0200
commit612b489d3e05b24c1b6690082e8518bac033e9d2 (patch)
tree23a6c556989071385d1c64730ed72bdbae7c239c /chart2
parentwriterprefect: run astyle (diff)
downloadcore-612b489d3e05b24c1b6690082e8518bac033e9d2.tar.gz
core-612b489d3e05b24c1b6690082e8518bac033e9d2.zip
loplugin:checkunusedparams
the "check for taking address of function" part was generating false+ Change-Id: Iad6203850901229b7b1b2f8938c68ec703cd343f Reviewed-on: https://gerrit.libreoffice.org/40613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx2
-rw-r--r--chart2/source/controller/inc/MultipleChartConverters.hxx1
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx1
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx3
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx3
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx5
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx8
-rw-r--r--chart2/source/controller/sidebar/ChartElementsPanel.cxx2
-rw-r--r--chart2/source/controller/sidebar/ChartSeriesPanel.cxx3
-rw-r--r--chart2/source/inc/AxisHelper.hxx6
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx8
-rw-r--r--chart2/source/inc/RegressionCurveHelper.hxx4
-rw-r--r--chart2/source/tools/AxisHelper.cxx8
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx26
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx5
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx11
-rw-r--r--chart2/source/view/charttypes/PieChart.hxx1
20 files changed, 31 insertions, 73 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index f7214e3e2946..245fc313558a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -153,7 +153,7 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal
if( m_bAxis )
AxisHelper::showAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext );
else
- AxisHelper::showGrid( m_nDimensionIndex, 0, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext );
+ AxisHelper::showGrid( m_nDimensionIndex, 0, m_bMain, xDiagram );
}
else
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 0f8bd60b38f6..f0f5f76e8f71 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -813,8 +813,7 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::
RegressionCurveHelper::changeRegressionCurveType(
eNewRegressionType,
xRegressionCurveContainer,
- xRegressionCurve,
- uno::Reference< uno::XComponentContext >());
+ xRegressionCurve);
}
}
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index a0e1b70ce273..cdf64d7473e8 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -141,7 +141,7 @@ void TitlesAndObjectsTabPage::commitToModel()
aNewExistenceList[1] = m_pCB_Grid_Y->IsChecked();
aNewExistenceList[2] = m_pCB_Grid_Z->IsChecked();
AxisHelper::changeVisibilityOfGrids( xDiagram
- , aOldExistenceList, aNewExistenceList, m_xCC );
+ , aOldExistenceList, aNewExistenceList );
}
}
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index c29fa506769e..37a9f8b0cde1 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -35,7 +35,6 @@ public:
const css::uno::Reference<css::frame::XModel> & xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
const css::awt::Size* pRefSize = nullptr );
virtual ~AllAxisItemConverter() override;
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 2f22f13fd01c..efef2960eb06 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -43,7 +43,6 @@ AllAxisItemConverter::AllAxisItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > & /*xNamedPropertyContainerFactory*/,
const awt::Size* pRefSize )
: MultipleItemConverter( rItemPool )
{
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index ef80018a7bb5..026720001bc9 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -162,8 +162,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
xCurve = RegressionCurveHelper::changeRegressionCurveType(
eNewRegress,
m_xCurveContainer,
- xCurve,
- uno::Reference< uno::XComponentContext >());
+ xCurve);
uno::Reference<beans::XPropertySet> xProperties( xCurve, uno::UNO_QUERY );
resetPropertySet( xProperties );
bChanged = true;
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index dc48db2d0fa9..f5e988551e5d 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -436,8 +436,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
xCurve = RegressionCurveHelper::changeRegressionCurveType(
eRegress,
xContainer,
- xCurve,
- uno::Reference< uno::XComponentContext >());
+ xCurve);
uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
resetPropertySet( xProperties );
bChanged = true;
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index eceb5af49d6d..e3b3e9146b3c 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -145,7 +145,7 @@ void ChartController::executeDispatch_InsertGrid()
InsertAxisOrGridDialogData aDialogOutput;
aDlg->getResult( aDialogOutput );
bool bChanged = AxisHelper::changeVisibilityOfGrids( xDiagram
- , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC );
+ , aDialogInput.aExistenceList, aDialogOutput.aExistenceList );
if( bChanged )
aUndoGuard.commit();
}
@@ -366,8 +366,7 @@ void ChartController::executeDispatch_InsertTrendline()
uno::Reference< chart2::XRegressionCurve > xCurve =
RegressionCurveHelper::addRegressionCurve(
SvxChartRegress::Linear,
- xRegressionCurveContainer,
- m_xCC );
+ xRegressionCurveContainer );
uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index de3eebd88e76..8ea9d08ab2a7 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -313,7 +313,7 @@ wrapper::ItemConverter* createItemConverter(
pItemConverter = new wrapper::AllAxisItemConverter(
xChartModel, rDrawModel.GetItemPool(),
- rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize.get());
+ rDrawModel, pRefSize.get());
}
break;
case OBJECTTYPE_GRID:
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 860cdde2bb9c..68b85a0b65a8 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -879,12 +879,12 @@ void ChartController::executeDispatch_ToggleGridHorizontal()
}
else
{
- AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram, m_xCC );
+ AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram );
}
}
else
{
- AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram, m_xCC );
+ AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram );
}
aUndoGuard.commit();
}
@@ -911,12 +911,12 @@ void ChartController::executeDispatch_ToggleGridVertical()
}
else
{
- AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram, m_xCC );
+ AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, false, xDiagram );
}
}
else
{
- AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram, m_xCC );
+ AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, true, xDiagram );
}
aUndoGuard.commit();
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 36241b580be8..39607513f4f8 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -155,7 +155,7 @@ void setGridVisible(const css::uno::Reference<css::frame::XModel>& xModel, GridT
if (bVisible)
AxisHelper::showGrid(nDimensionIndex, nCooSysIndex, bMajor,
- xDiagram, comphelper::getProcessComponentContext());
+ xDiagram);
else
AxisHelper::hideGrid(nDimensionIndex, nCooSysIndex, bMajor, xDiagram);
}
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 6eb04776332b..07cf968c2e7b 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -164,8 +164,7 @@ void setTrendlineVisible(const css::uno::Reference<css::frame::XModel>&
{
RegressionCurveHelper::addRegressionCurve(
SvxChartRegress::Linear,
- xRegressionCurveContainer,
- comphelper::getProcessComponentContext());
+ xRegressionCurveContainer);
}
else
RegressionCurveHelper::removeAllExceptMeanValueLine(
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index 65d908aacec3..7343c5f64a09 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -77,8 +77,7 @@ public:
, ReferenceSizeProvider * pRefSizeProvider = nullptr );
static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
- , const css::uno::Reference< css::chart2::XDiagram >& xDiagram
- , const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
static void hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis
, const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
@@ -174,8 +173,7 @@ public:
static bool changeVisibilityOfGrids( const css::uno::Reference< css::chart2::XDiagram>& xDiagram
, const css::uno::Sequence< sal_Bool >& rOldExistenceList
- , const css::uno::Sequence< sal_Bool >& rNewExistenceList
- , const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ , const css::uno::Sequence< sal_Bool >& rNewExistenceList );
static bool changeVisibilityOfAxes( const css::uno::Reference< css::chart2::XDiagram>& xDiagram
, const css::uno::Sequence< sal_Bool >& rOldExistenceList
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index c1209851f262..5eb72c1a1ee8 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -119,13 +119,7 @@ public:
, const css::uno::Reference< css::frame::XModel >& xChartModel
, sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc
- SAL_DLLPRIVATE static OUString createParticleForDiagram(
- const css::uno::Reference< css::chart2::XDiagram >& xDiagram
- , ChartModel& rModel);
-
- SAL_DLLPRIVATE static OUString createParticleForDiagram(
- const css::uno::Reference< css::chart2::XDiagram >& xDiagram
- , const css::uno::Reference< css::frame::XModel >& xChartModel );
+ SAL_DLLPRIVATE static OUString createParticleForDiagram();
static OUString createParticleForCoordinateSystem(
const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index f268de036a8b..dad317be913f 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -98,7 +98,6 @@ namespace RegressionCurveHelper
addRegressionCurve(
SvxChartRegress eType,
css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xCurveContainer,
- const css::uno::Reference<css::uno::XComponentContext>& xContext,
const css::uno::Reference<css::beans::XPropertySet >& xPropertySource =
css::uno::Reference<css::beans::XPropertySet>(),
const css::uno::Reference<css::beans::XPropertySet>& xEquationProperties =
@@ -114,8 +113,7 @@ namespace RegressionCurveHelper
changeRegressionCurveType(
SvxChartRegress eType,
css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xRegressionCurveContainer,
- css::uno::Reference<css::chart2::XRegressionCurve> const & xRegressionCurve,
- const css::uno::Reference<css::uno::XComponentContext>& xContext );
+ css::uno::Reference<css::chart2::XRegressionCurve> const & xRegressionCurve );
/// returns a calculator object for regression curves (used by the view)
OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurveCalculator>
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());
}
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 84ad1938459d..272d26ad82b6 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -1574,15 +1574,6 @@ bool PieChart::performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLab
return true;
}
-/** Handle the outer placement of the labels in the best fit case.
- *
- */
-bool PieChart::performLabelBestFitOuterPlacement(ShapeParam& /*rShapeParam*/, PieLabelInfo& /*rPieLabelInfo*/)
-{
- SAL_WARN( "chart2.pie.label.bestfit", "to be implemented" );
- return false;
-}
-
/** Handle the placement of the label in the best fit case.
* First off the routine try to place the label inside the related pie slice,
* if this is not possible the label is placed outside.
@@ -1594,7 +1585,7 @@ void PieChart::performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLa
if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) )
{
- performLabelBestFitOuterPlacement(rShapeParam, rPieLabelInfo);
+ // TODO
}
}
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 1b39ba229ed0..d49e20da575f 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -107,7 +107,6 @@ struct PieLabelInfo;
, const css::awt::Size& rPageSize );
bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo const & rPieLabelInfo);
- static bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo);
void performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo);
private: //member