diff options
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController_EditData.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/view/axes/VCartesianAxis.cxx | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index aebf313603cc..9cba950495b9 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -46,8 +46,6 @@ void ChartController::executeDispatch_EditData() Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); if( xChartDoc.is()) { - vcl::Window* pParent( NULL ); - Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); { @@ -56,6 +54,7 @@ void ChartController::executeDispatch_EditData() UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData( SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ), m_xUndoManager ); + vcl::Window* pParent( NULL ); DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC ); if (aDataEditorDialog.Execute() == RET_OK) aDataEditorDialog.ApplyChangesToModel(); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 957b9af5dc26..4f9be0c43b82 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -697,10 +697,6 @@ bool VCartesianAxis::createTextShapes( if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; - const TickInfo* pPreviousVisibleTickInfo = NULL; - const TickInfo* pPREPreviousVisibleTickInfo = NULL; - const TickInfo* pLastVisibleNeighbourTickInfo = NULL; - bool bLimitedHeight = fabs(aTextToTickDistance.getX()) > fabs(aTextToTickDistance.getY()); //prepare properties for multipropertyset-interface of shape @@ -715,6 +711,9 @@ bool VCartesianAxis::createTextShapes( uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); + const TickInfo* pPreviousVisibleTickInfo = NULL; + const TickInfo* pPREPreviousVisibleTickInfo = NULL; + const TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo @@ -895,9 +894,6 @@ bool VCartesianAxis::createTextShapesSimple( if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; - const TickInfo* pPreviousVisibleTickInfo = NULL; - const TickInfo* pLastVisibleNeighbourTickInfo = NULL; - bool bLimitedHeight = fabs(aTextToTickDistance.getX()) > fabs(aTextToTickDistance.getY()); //prepare properties for multipropertyset-interface of shape @@ -912,6 +908,8 @@ bool VCartesianAxis::createTextShapesSimple( uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); + const TickInfo* pPreviousVisibleTickInfo = NULL; + const TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo |