diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-09 15:31:00 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-10 10:13:54 -0400 |
commit | 6f97be903beee9f6ad5f1e859ec1b402501a4d47 (patch) | |
tree | c12fc2e03798a5721559a8f56dea1d2f840145b8 /chart2 | |
parent | ae4060cae9d26aca23d8f1e9d6782ca66c4ce6d3 (diff) |
Reduce indentation by early bailout.
Change-Id: I64c88b007564d3ca7b4f4bd95a458fee6bda7854
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 272 |
1 files changed, 136 insertions, 136 deletions
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index d141d011ab07..7cd99f22340a 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1848,165 +1848,165 @@ bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditio void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) { SolarMutexGuard aGuard; - if( m_pDrawViewWrapper && m_pChartWindow ) - { - Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel())); - sal_uInt16 nModifier = rEvent.GetModifier(); - sal_Bool bLeftDown = rEvent.IsLeft(); - if ( m_pDrawViewWrapper->IsTextEdit() ) - { - if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) ) - { - m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferredPointer( - aMousePos, m_pChartWindow, nModifier, bLeftDown ) ); - return; - } - } - else if( m_pDrawViewWrapper->IsAction() ) - { - return;//don't change pointer during running action - } + if (!m_pDrawViewWrapper || !m_pChartWindow) + return; - SdrHdl* pHitSelectionHdl = 0; - if( m_aSelection.isResizeableObjectSelected() ) - pHitSelectionHdl = m_pDrawViewWrapper->PickHandle( aMousePos ); + Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel())); + sal_uInt16 nModifier = rEvent.GetModifier(); + sal_Bool bLeftDown = rEvent.IsLeft(); - if( pHitSelectionHdl ) + if ( m_pDrawViewWrapper->IsTextEdit() ) + { + if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) ) { + m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferredPointer( + aMousePos, m_pChartWindow, nModifier, bLeftDown ) ); + return; + } + } + else if( m_pDrawViewWrapper->IsAction() ) + { + return;//don't change pointer during running action + } - Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer( - aMousePos, m_pChartWindow, nModifier, bLeftDown ); - bool bForceArrowPointer = false; + SdrHdl* pHitSelectionHdl = 0; + if( m_aSelection.isResizeableObjectSelected() ) + pHitSelectionHdl = m_pDrawViewWrapper->PickHandle( aMousePos ); - ObjectIdentifier aOID( m_aSelection.getSelectedOID() ); + if( pHitSelectionHdl ) + { + Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer( + aMousePos, m_pChartWindow, nModifier, bLeftDown ); + bool bForceArrowPointer = false; - switch( aPointer.GetStyle()) - { - case POINTER_NSIZE: - case POINTER_SSIZE: - case POINTER_WSIZE: - case POINTER_ESIZE: - case POINTER_NWSIZE: - case POINTER_NESIZE: - case POINTER_SWSIZE: - case POINTER_SESIZE: - if( ! m_aSelection.isResizeableObjectSelected() ) - bForceArrowPointer = true; - break; - case POINTER_MOVE: - if ( !aOID.isDragableObject() ) - bForceArrowPointer = true; - break; - case POINTER_MOVEPOINT: - case POINTER_MOVEBEZIERWEIGHT: - // there is no point-editing in a chart - // the POINTER_MOVEBEZIERWEIGHT appears in 3d data points - bForceArrowPointer = true; - break; - default: - break; - } + ObjectIdentifier aOID( m_aSelection.getSelectedOID() ); - if( bForceArrowPointer ) - m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); - else - m_pChartWindow->SetPointer( aPointer ); + switch( aPointer.GetStyle()) + { + case POINTER_NSIZE: + case POINTER_SSIZE: + case POINTER_WSIZE: + case POINTER_ESIZE: + case POINTER_NWSIZE: + case POINTER_NESIZE: + case POINTER_SWSIZE: + case POINTER_SESIZE: + if( ! m_aSelection.isResizeableObjectSelected() ) + bForceArrowPointer = true; + break; + case POINTER_MOVE: + if ( !aOID.isDragableObject() ) + bForceArrowPointer = true; + break; + case POINTER_MOVEPOINT: + case POINTER_MOVEBEZIERWEIGHT: + // there is no point-editing in a chart + // the POINTER_MOVEBEZIERWEIGHT appears in 3d data points + bForceArrowPointer = true; + break; + default: + break; } + + if( bForceArrowPointer ) + m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); else + m_pChartWindow->SetPointer( aPointer ); + + return; + } + + // #i12587# support for shapes in chart + if ( m_eDrawMode == CHARTDRAW_INSERT && + ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) ) + { + PointerStyle ePointerStyle = POINTER_DRAW_RECT; + SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() ); + switch ( eKind ) { - // #i12587# support for shapes in chart - if ( m_eDrawMode == CHARTDRAW_INSERT && - ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) ) - { - PointerStyle ePointerStyle = POINTER_DRAW_RECT; - SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() ); - switch ( eKind ) + case OBJ_LINE: { - case OBJ_LINE: - { - ePointerStyle = POINTER_DRAW_LINE; - } - break; - case OBJ_RECT: - case OBJ_CUSTOMSHAPE: - { - ePointerStyle = POINTER_DRAW_RECT; - } - break; - case OBJ_CIRC: - { - ePointerStyle = POINTER_DRAW_ELLIPSE; - } - break; - case OBJ_FREELINE: - { - ePointerStyle = POINTER_DRAW_POLYGON; - } - break; - case OBJ_TEXT: - { - ePointerStyle = POINTER_DRAW_TEXT; - } - break; - case OBJ_CAPTION: - { - ePointerStyle = POINTER_DRAW_CAPTION; - } - break; - default: - { - ePointerStyle = POINTER_DRAW_RECT; - } - break; + ePointerStyle = POINTER_DRAW_LINE; } - m_pChartWindow->SetPointer( Pointer( ePointerStyle ) ); - return; - } + break; + case OBJ_RECT: + case OBJ_CUSTOMSHAPE: + { + ePointerStyle = POINTER_DRAW_RECT; + } + break; + case OBJ_CIRC: + { + ePointerStyle = POINTER_DRAW_ELLIPSE; + } + break; + case OBJ_FREELINE: + { + ePointerStyle = POINTER_DRAW_POLYGON; + } + break; + case OBJ_TEXT: + { + ePointerStyle = POINTER_DRAW_TEXT; + } + break; + case OBJ_CAPTION: + { + ePointerStyle = POINTER_DRAW_CAPTION; + } + break; + default: + { + ePointerStyle = POINTER_DRAW_RECT; + } + break; + } + m_pChartWindow->SetPointer( Pointer( ePointerStyle ) ); + return; + } - OUString aHitObjectCID( - SelectionHelper::getHitObjectCID( - aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ )); + OUString aHitObjectCID( + SelectionHelper::getHitObjectCID( + aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ )); - if( m_pDrawViewWrapper->IsTextEdit() ) + if( m_pDrawViewWrapper->IsTextEdit() ) + { + if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) ) + { + m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); + return; + } + } + + if( aHitObjectCID.isEmpty() ) + { + //additional shape was hit + m_pChartWindow->SetPointer( POINTER_MOVE ); + } + else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) ) + { + if( (m_eDragMode == SDRDRAG_ROTATE) + && SelectionHelper::isRotateableObject( aHitObjectCID + , getModel() ) ) + m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) ); + else + { + ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID ); + if( eHitObjectType == OBJECTTYPE_DATA_POINT ) { - if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) ) + if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID()) + && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) ) { m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); return; } } - - if( aHitObjectCID.isEmpty() ) - { - //additional shape was hit - m_pChartWindow->SetPointer( POINTER_MOVE ); - } - else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) ) - { - if( (m_eDragMode == SDRDRAG_ROTATE) - && SelectionHelper::isRotateableObject( aHitObjectCID - , getModel() ) ) - m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) ); - else - { - ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID ); - if( eHitObjectType == OBJECTTYPE_DATA_POINT ) - { - if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID()) - && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) ) - { - m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); - return; - } - } - m_pChartWindow->SetPointer( POINTER_MOVE ); - } - } - else - m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); + m_pChartWindow->SetPointer( POINTER_MOVE ); } } + else + m_pChartWindow->SetPointer( Pointer( POINTER_ARROW )); } } //namespace chart |