summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-12 15:09:30 +0200
committerNoel Grandin <noel@peralex.com>2015-08-14 10:52:46 +0200
commit70a30fd179266f65500b880ccb0f87011b670fca (patch)
tree881d1723620d030171ff3de9bad2cc96f80994ed /chart2/source
parent9045d0bf35c9b4d5f6d8f791017124341abf8d4f (diff)
loplugin: defaultparams
Change-Id: I65c0ed65b20f606cf1409a3158ff1ef1e2d6cd9f
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx2
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx8
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx8
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx18
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx12
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx12
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx2
-rw-r--r--chart2/source/controller/sidebar/ChartErrorBarPanel.cxx6
-rw-r--r--chart2/source/inc/CommonFunctors.hxx6
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx6
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx2
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx4
-rw-r--r--chart2/source/tools/LegendHelper.cxx2
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.cxx2
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx2
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx2
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx7
-rw-r--r--chart2/source/view/main/ChartView.cxx8
-rw-r--r--chart2/source/view/main/GL3DRenderer.cxx2
-rw-r--r--chart2/source/view/main/PlottingPositionHelper.cxx2
29 files changed, 74 insertions, 79 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 6a4e118e165e..e3c0b553e363 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -715,7 +715,7 @@ OUString WrappedErrorBarRangePositiveProperty::getValueFromSeries( const Referen
{
uno::Reference< chart2::data::XDataSequence > xSeq(
StatisticsHelper::getErrorDataSequenceFromDataSource(
- xErrorBarDataSource, true /* positive */, true /* y-error */ ));
+ xErrorBarDataSource, true /* positive */ ));
if( xSeq.is())
aRet = xSeq->getSourceRangeRepresentation();
else
@@ -782,7 +782,7 @@ OUString WrappedErrorBarRangeNegativeProperty::getValueFromSeries( const Referen
{
uno::Reference< chart2::data::XDataSequence > xSeq(
StatisticsHelper::getErrorDataSequenceFromDataSource(
- xErrorBarDataSource, false /* positive */, true /* y-error */ ));
+ xErrorBarDataSource, false /* positive */ ));
if( xSeq.is())
aRet = xSeq->getSourceRangeRepresentation();
else
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index d967d6d79808..37f259ec8b5b 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -915,7 +915,7 @@ void DataBrowserModel::updateFromModel()
}
// add ranges for error bars if present for a series
- if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ true ))
+ if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx] ))
addErrorBarRanges( aSeries[nSeriesIdx], nYAxisNumberFormatKey, nSeqIdx, nHeaderEnd, true );
if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ false ))
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 6f0e30738e29..cab2df17b2f3 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -617,7 +617,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID(rObjectCID , xChartModel));
Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY );
- aRet += getName(eObjectType, false);
+ aRet += getName(eObjectType);
if( xCurveCnt.is())
{
@@ -685,12 +685,12 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
else
{
// non-verbose
- aRet = ObjectNameProvider::getName( eObjectType, false );
+ aRet = ObjectNameProvider::getName( eObjectType );
}
}
else
{
- aRet = ObjectNameProvider::getName( eObjectType, false );
+ aRet = ObjectNameProvider::getName( eObjectType );
}
return aRet;
}
@@ -833,7 +833,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries(
if( xSeries.is() )
{
OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_SERIES);
- replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) );
+ replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType ) );
replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) );
return aRet;
}
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 6f0d2b8ec022..5ee6d2afc6b8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -77,7 +77,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId,
rCheckbox.Check( static_cast<const SfxBoolItem*>(pPoolItem)->GetValue() );
else
{
- rCheckbox.EnableTriState( true );
+ rCheckbox.EnableTriState();
rCheckbox.SetState( TRISTATE_INDET );
}
}
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index ce21c1c31c88..0bace68f9495 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -188,16 +188,16 @@ void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs )
switch( nLegendPosition )
{
case chart2::LegendPosition_LINE_START:
- m_pRbtLeft->Check(true);
+ m_pRbtLeft->Check();
break;
case chart2::LegendPosition_PAGE_START:
- m_pRbtTop->Check(true);
+ m_pRbtTop->Check();
break;
case chart2::LegendPosition_LINE_END:
- m_pRbtRight->Check(true);
+ m_pRbtRight->Check();
break;
case chart2::LegendPosition_PAGE_END:
- m_pRbtBottom->Check(true);
+ m_pRbtBottom->Check();
break;
default:
break;
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index acc8d0872502..98f1641c9f06 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -179,7 +179,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, true, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCB_SetIntercept->EnableTriState( true );
+ m_pCB_SetIntercept->EnableTriState();
m_pCB_SetIntercept->SetState( TRISTATE_INDET );
}
else
@@ -192,7 +192,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, true, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCB_ShowEquation->EnableTriState( true );
+ m_pCB_ShowEquation->EnableTriState();
m_pCB_ShowEquation->SetState( TRISTATE_INDET );
}
else
@@ -205,7 +205,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, true, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCB_ShowCorrelationCoeff->EnableTriState( true );
+ m_pCB_ShowCorrelationCoeff->EnableTriState();
m_pCB_ShowCorrelationCoeff->SetState( TRISTATE_INDET );
}
else
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 7c866eed86b5..0e48c337d3f4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -113,9 +113,9 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
m_pCB_Shading->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectShading ) );
m_pCB_ObjectLines->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
- m_pCB_RoundedEdge->EnableTriState( true );
- m_pCB_Shading->EnableTriState( true );
- m_pCB_ObjectLines->EnableTriState( true );
+ m_pCB_RoundedEdge->EnableTriState();
+ m_pCB_Shading->EnableTriState();
+ m_pCB_ObjectLines->EnableTriState();
initControlsFromModel();
}
@@ -217,11 +217,11 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel()
else if(aProps.m_aShadeMode == drawing::ShadeMode_SMOOTH)
{
m_pCB_Shading->EnableTriState( false );
- m_pCB_Shading->Check(true);
+ m_pCB_Shading->Check();
}
else
{
- m_pCB_Shading->EnableTriState( true );
+ m_pCB_Shading->EnableTriState();
m_pCB_Shading->SetState( TRISTATE_INDET );
}
@@ -233,18 +233,18 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel()
else if(aProps.m_nObjectLines==1)
{
m_pCB_ObjectLines->EnableTriState( false );
- m_pCB_ObjectLines->Check(true);
+ m_pCB_ObjectLines->Check();
}
else
{
- m_pCB_ObjectLines->EnableTriState( true );
+ m_pCB_ObjectLines->EnableTriState();
m_pCB_ObjectLines->SetState( TRISTATE_INDET );
}
if(aProps.m_nRoundedEdges >= 5)
{
m_pCB_RoundedEdge->EnableTriState( false );
- m_pCB_RoundedEdge->Check(true);
+ m_pCB_RoundedEdge->Check();
}
else if(aProps.m_nRoundedEdges<0)
{
@@ -253,7 +253,7 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel()
}
else
{
- m_pCB_RoundedEdge->EnableTriState( true );
+ m_pCB_RoundedEdge->EnableTriState();
m_pCB_RoundedEdge->Check(false);
}
m_pCB_RoundedEdge->Enable( !m_pCB_ObjectLines->IsChecked() );
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 7c76e18a6e12..b1cf19fbf44f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled)
m_pMFZRotation->SetValue(m_nZRotation);
}
- ThreeDHelper::switchRightAngledAxes( m_xSceneProperties, m_pCbxRightAngledAxes->IsChecked(), true /*bRotateLights*/ );
+ ThreeDHelper::switchRightAngledAxes( m_xSceneProperties, m_pCbxRightAngledAxes->IsChecked() );
return 0;
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 7859bb61de45..9fac6a5c3824 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -61,7 +61,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet
get(m_pFtABCD,"labelABCD");
m_pCtrlDial->SetText(m_pFtABCD->GetText());
m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
- m_pOrientHlp->Enable( true );
+ m_pOrientHlp->Enable();
m_pCbStacked->EnableTriState( false );
m_pOrientHlp->AddDependentWindow( *m_pFlOrient );
@@ -162,7 +162,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
SfxItemState aState = rInAttrs->GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCbShowDescription->EnableTriState( true );
+ m_pCbShowDescription->EnableTriState();
m_pCbShowDescription->SetState( TRISTATE_INDET );
}
else
@@ -210,7 +210,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCbTextOverlap->EnableTriState( true );
+ m_pCbTextOverlap->EnableTriState();
m_pCbTextOverlap->SetState( TRISTATE_INDET );
}
else
@@ -229,7 +229,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem );
if( aState == SfxItemState::DONTCARE )
{
- m_pCbTextBreak->EnableTriState( true );
+ m_pCbTextBreak->EnableTriState();
m_pCbTextBreak->SetState( TRISTATE_INDET );
}
else
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index f27f8e8cf64c..4a430b9efb84 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -342,12 +342,12 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs)
m_pLB_AxisType->SelectEntryPos( nPos );
}
- m_pCbxAutoMin->Check( true );
- m_pCbxAutoMax->Check( true );
- m_pCbxAutoStepMain->Check( true );
- m_pCbxAutoStepHelp->Check( true );
- m_pCbxAutoOrigin->Check( true );
- m_pCbx_AutoTimeResolution->Check( true );
+ m_pCbxAutoMin->Check();
+ m_pCbxAutoMax->Check();
+ m_pCbxAutoStepMain->Check();
+ m_pCbxAutoStepHelp->Check();
+ m_pCbxAutoOrigin->Check();
+ m_pCbx_AutoTimeResolution->Check();
if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SfxItemState::SET)
m_pCbxAutoMin->Check(static_cast<const SfxBoolItem*>(pPoolItem)->GetValue());
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index e6d372178752..06a4e5d3fbf5 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -141,14 +141,14 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
{
const SfxPoolItem *pPoolItem = NULL;
- m_pRbtAxis1->Check(true);
+ m_pRbtAxis1->Check();
m_pRbtAxis2->Check(false);
if (rInAttrs->GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SfxItemState::SET)
{
long nVal=static_cast<const SfxInt32Item*>(pPoolItem)->GetValue();
if(nVal==CHART_AXIS_SECONDARY_Y)
{
- m_pRbtAxis2->Check(true);
+ m_pRbtAxis2->Check();
m_pRbtAxis1->Check(false);
}
}
@@ -214,11 +214,11 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
long nVal=static_cast<const SfxInt32Item*>(pPoolItem)->GetValue();
if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
- m_pRB_DontPaint->Check(true);
+ m_pRB_DontPaint->Check();
else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
- m_pRB_AssumeZero->Check(true);
+ m_pRB_AssumeZero->Check();
else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
- m_pRB_ContinueLine->Check(true);
+ m_pRB_ContinueLine->Check();
}
else
{
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 25fa53dde0b8..42326214a03e 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -46,7 +46,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow,
m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
m_pCbStacked->EnableTriState( false );
- m_pOrientHlp->Enable( true );
+ m_pOrientHlp->Enable();
m_pOrientHlp->AddDependentWindow( *m_pFtRotate, TRISTATE_TRUE );
if( !bWithRotation )
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 7df062fd08fe..8fe6db0bc39a 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -105,8 +105,8 @@ void ChartController::executeDispatch_InsertAxes()
{
InsertAxisOrGridDialogData aDialogInput;
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(getModel());
- AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, true );
- AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, true );
+ AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram );
+ AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram );
SolarMutexGuard aGuard;
ScopedVclPtrInstance<SchAxisDlg> aDlg( m_pChartWindow, aDialogInput );
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 7c44d85975da..9c1c7c4c1358 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -100,8 +100,7 @@ bool lcl_GrowAndShiftLogic(
return ::chart::RelativePositionHelper::centerGrow(
rInOutRelPos, rInOutRelSize,
- fRelativeGrowX, fRelativeGrowY,
- /* bCheck = */ true );
+ fRelativeGrowX, fRelativeGrowY );
}
bool lcl_MoveObjectLogic(
@@ -120,8 +119,7 @@ bool lcl_MoveObjectLogic(
return ::chart::RelativePositionHelper::moveObject(
rInOutRelPos, rObjectSize,
- fRelativeShiftX, fRelativeShiftY,
- /* bCheck = */ true );
+ fRelativeShiftX, fRelativeShiftY );
}
void lcl_insertMenuCommand(
@@ -795,14 +793,14 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
UndoGuard aUndoGuard( pChartDragMethod->getUndoDescription(),
m_xUndoManager );
- if( pDrawViewWrapper->EndDragObj(false) )
+ if( pDrawViewWrapper->EndDragObj() )
{
bDraggingDone = true;
aUndoGuard.commit();
}
}
- if( !bDraggingDone && pDrawViewWrapper->EndDragObj(false) )
+ if( !bDraggingDone && pDrawViewWrapper->EndDragObj() )
{
try
{
@@ -1020,7 +1018,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
Reference< chart2::XRegressionCurve > xTrendline( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xCurveCnt ) );
bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline );
Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) );
- bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true );
+ bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries );
bool bHasXErrorBars = StatisticsHelper::hasErrorBars( xSeries, false );
bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries );
bool bHasDataLabelsAtPoints = DataSeriesHelper::hasDataLabelsAtPoints( xSeries );
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index e28fbe8c03dc..ea98429e3d51 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -258,7 +258,7 @@ void ControllerState::update(
bMayFormatXErrorBars = bMayDeleteXErrorBars = StatisticsHelper::hasErrorBars( xGivenDataSeries, false );
bMayAddXErrorBars = ! bMayDeleteXErrorBars;
- bMayFormatYErrorBars = bMayDeleteYErrorBars = StatisticsHelper::hasErrorBars( xGivenDataSeries, true );
+ bMayFormatYErrorBars = bMayDeleteYErrorBars = StatisticsHelper::hasErrorBars( xGivenDataSeries );
bMayAddYErrorBars = ! bMayDeleteYErrorBars;
}
}
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 9f5d5ed624ae..ff05b04b4ca5 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -313,7 +313,7 @@ void ImplObjectHierarchy::createAxesTree(
lcl_ObjectToOID( xChartDoc ));
// get all axes, also invisible ones
- aAxes = AxisHelper::getAllAxesOfDiagram( xDiagram, /* bOnlyVisible = */ false );
+ aAxes = AxisHelper::getAllAxesOfDiagram( xDiagram );
// Grids
Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY );
for( sal_Int32 nA=0; nA<aAxes.getLength(); ++nA )
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index c319943bed44..032795ff7396 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -313,11 +313,11 @@ void ChartErrorBarPanel::updateData()
SolarMutexGuard aGuard;
if (bPos && bNeg)
- mpRBPosAndNeg->Check(true);
+ mpRBPosAndNeg->Check();
else if (bPos)
- mpRBPos->Check(true);
+ mpRBPos->Check();
else if (bNeg)
- mpRBNeg->Check(true);
+ mpRBNeg->Check();
sal_Int32 nTypePos = getTypePos(mxModel, aCID);
mpLBType->SelectEntryPos(nTypePos);
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index 692b0da2fe8c..226eeed442d8 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -85,8 +85,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co
* pDouble,
rtl_math_StringFormat_Automatic,
-1, // use maximum decimal places available
- sal_Char( '.' ), // decimal separator
- false // do not erase trailing zeros
+ sal_Char( '.' ) // decimal separator
);
}
else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
@@ -128,8 +127,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function<
fNumber,
rtl_math_StringFormat_Automatic,
-1, // use maximum number of decimal places
- static_cast< sal_Char >( '.' ),
- false // do not erase trailing zeros
+ static_cast< sal_Char >( '.' )
);
}
};
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index e6756a57dc6b..f9e4d258320f 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -176,11 +176,11 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
Sequence< Reference< data::XLabeledDataSequence > > aNewSequences;
Reference< data::XLabeledDataSequence > xValuesSize(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-size", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-size" ));
Reference< data::XLabeledDataSequence > xValuesY(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y" ));
Reference< data::XLabeledDataSequence > xValuesX(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x" ));
if( ! xValuesX.is() ||
! xValuesY.is() ||
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 52be707a66a9..3f81a0eee22a 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -154,7 +154,7 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
// values-y
Reference< data::XLabeledDataSequence > xValuesY(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y" ));
// re-use values-... as values-y
if( ! xValuesY.is())
{
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 44705c1a2165..33175a41e9ef 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -161,9 +161,9 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
// values-y
Reference< data::XLabeledDataSequence > xValuesY(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y" ));
Reference< data::XLabeledDataSequence > xValuesX(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x" ));
// re-use values-... as values-x/values-y
if( ! xValuesX.is() ||
! xValuesY.is())
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 129a7a71d61f..6ed419984fd8 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -65,7 +65,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
void LegendHelper::hideLegend( ChartModel& rModel )
{
- uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( rModel, 0, false );
+ uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( rModel, 0 );
uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
if( xProp.is())
{
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index a83a73fdbfa5..6f7a39da897d 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -316,7 +316,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co
//create point sequences for each tick depth
sal_Int32 nDepthCount = this->getTickDepth();
- sal_Int32 nMaxMajorTickCount = this->getMaxTickCount( 0 );
+ sal_Int32 nMaxMajorTickCount = this->getMaxTickCount();
if (nDepthCount <= 0 || nMaxMajorTickCount <= 0)
return;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 01a566dc330d..c6e9379c605a 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -319,7 +319,7 @@ void PieChart::createTextLabelShape(
awt::Point aScreenPosition2D(
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment, nLabelPlacement
, rParam.mfUnitCircleStartAngleDegree, rParam.mfUnitCircleWidthAngleDegree
- , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius, rParam.mfLogicZ+0.5, 0 ));
+ , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius, rParam.mfLogicZ+0.5 ));
///the screen position of the pie/donut center is calculated.
PieLabelInfo aPieLabelInfo;
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index d2c17a5a26a5..2fa557f42c48 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -403,7 +403,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries& rDataSeries
{
sal_Unicode cDecSeparator = '.';//@todo get this locale dependent
aNumber = ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G /*rtl_math_StringFormat*/
- , 3/*DecPlaces*/ , cDecSeparator, false /*bEraseTrailingDecZeros*/ );
+ , 3/*DecPlaces*/ , cDecSeparator );
}
return aNumber;
}
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 9f5db9926456..10b14fe8e57e 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -487,7 +487,6 @@ void VDiagram::createShapes_3d()
bool bAddFloorAndWall = DiagramHelper::isSupportingFloorAndWall( m_xDiagram );
const bool bDoubleSided = false;
- const bool bFlatNormals = true;
//add walls
{
@@ -523,7 +522,7 @@ void VDiagram::createShapes_3d()
uno::Reference< drawing::XShape > xShape =
m_pShapeFactory->createStripe( xWallGroup_Shapes, aStripe
- , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture, bFlatNormals );
+ , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture );
if( !bAddFloorAndWall )
{
//we always need this object as dummy object for correct scene dimensions
@@ -551,7 +550,7 @@ void VDiagram::createShapes_3d()
uno::Reference< drawing::XShape > xShape =
m_pShapeFactory->createStripe(xWallGroup_Shapes, aStripe
- , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture, bFlatNormals );
+ , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture );
if( !bAddFloorAndWall )
{
//we always need this object as dummy object for correct scene dimensions
@@ -625,7 +624,7 @@ void VDiagram::createShapes_3d()
uno::Reference< drawing::XShape > xShape =
m_pShapeFactory->createStripe(xOuterGroup_Shapes, aStripe
- , xFloorProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, 0, bFlatNormals );
+ , xFloorProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, 0 );
CuboidPlanePosition eBottomPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBottom( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) );
if( !bAddFloorAndWall || (CuboidPlanePosition_Bottom!=eBottomPos) )
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index be644ba192b2..2877ba560ade 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1212,7 +1212,7 @@ void ChartView::init()
m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) );
m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory();
m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage();
- StartListening( m_pDrawModelWrapper->getSdrModel(), false /*bPreventDups*/ );
+ StartListening( m_pDrawModelWrapper->getSdrModel() );
}
}
@@ -1234,7 +1234,7 @@ ChartView::~ChartView()
if( m_pDrawModelWrapper.get() )
{
SolarMutexGuard aSolarGuard;
- EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
+ EndListening( m_pDrawModelWrapper->getSdrModel() );
m_pDrawModelWrapper.reset();
}
m_xDrawPage = NULL;
@@ -2081,7 +2081,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
OUString aRole( ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( xChartType ) );
Reference< data::XLabeledDataSequence > xLabeledSequence(
- DataSeriesHelper::getDataSequenceByRole( xSeriesSource, aRole, false ));
+ DataSeriesHelper::getDataSequenceByRole( xSeriesSource, aRole ));
if( xLabeledSequence.is() )
{
Reference< data::XDataSequence > xValues( xLabeledSequence->getValues() );
@@ -2905,7 +2905,7 @@ void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference<
// ____ XUpdatable ____
void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception)
{
- impl_updateView(true);
+ impl_updateView();
//#i100778# migrate all imported or old documents to a plot area sizing exclusive axes (in case the save settings allow for this):
//Although in general it is a bad idea to change the model from within the view this is exceptionally the best place to do this special conversion.
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 4d10e4f8b4d2..2dc32a3614fe 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -439,7 +439,7 @@ void OpenGL3DRenderer::init()
m_TextInfoBatch.batchNum = 512;
CHECK_GL_ERROR();
glViewport(0, 0, m_iWidth, m_iHeight);
- Set3DSenceInfo(0xFFFFFF, true);
+ Set3DSenceInfo(0xFFFFFF);
m_GlobalScaleMatrix = glm::scale(glm::vec3(0.01f, 0.01f, 0.01f));
}
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 1fab03024824..25a22a649bf0 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -625,7 +625,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformLogicToScene( double f
this->clipLogicValues( &fX,&fY,&fZ );
double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX;
double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY;
- return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, true );
+ return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ );
}
drawing::Position3D PolarPlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const