diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-02 15:42:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-05-05 12:47:48 +0200 |
| commit | 4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch) | |
| tree | b059d288339a68aa4c3901f1100e99b04d05a23d /chart2 | |
| parent | b4107411900f5bb4c215e2d9db09fc2b2b82939b (diff) | |
simplify ternary conditions "xxx ? yyy : false"
Look for code like:
xxx ? yyy : false;
Which can be simplified to:
xxx && yyy
Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'chart2')
4 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 20645416fa42..f011de58fd90 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -139,7 +139,7 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel m_bProvidesStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType ); m_bProvidesMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) - .getLength() ? true : false; + .getLength(); } } diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 87734a58d8c4..2ca2bf65a91f 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -125,7 +125,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen { try { - bool bShowLegend = m_pCbxShow ? m_pCbxShow->IsChecked() : false; + bool bShowLegend = m_pCbxShow && m_pCbxShow->IsChecked(); ChartModel* pModel = dynamic_cast<ChartModel*>(xChartModel.get()); uno::Reference< beans::XPropertySet > xProp( LegendHelper::getLegend( *pModel,m_xCC,bShowLegend ), uno::UNO_QUERY ); if( xProp.is() ) diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index a60f172b3018..8437a57758aa 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -816,7 +816,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) { bool bDraggingDone = false; SdrDragMethod* pDragMethod = pDrawViewWrapper->SdrView::GetDragMethod(); - bool bIsMoveOnly = pDragMethod ? pDragMethod->getMoveOnly() : false; + bool bIsMoveOnly = pDragMethod && pDragMethod->getMoveOnly(); DragMethod_Base* pChartDragMethod = dynamic_cast< DragMethod_Base* >(pDragMethod); if( pChartDragMethod ) { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 2e0f7a59227b..fe3fbb3e3c5b 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -523,7 +523,7 @@ void ControllerCommandDispatch::updateCommandAvailability() // @todo: determine correctly bool bHasSuitableClipboardContent = true; - bool bShapeContext = ( m_pChartController ? m_pChartController->isShapeContext() : false ); + bool bShapeContext = m_pChartController && m_pChartController->isShapeContext(); bool bDisableDataTableDialog = false; if ( m_xController.is() ) |