diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:56:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:56:22 +0000 |
| commit | e3ffb481262c5a0e5b2e765cfe6708b32138f432 (patch) | |
| tree | 0c4117453e585c598b2ef50dd4d70fb7afde474f /chart2/source/controller/main/ChartController.cxx | |
| parent | INTEGRATION: CWS chart11 (1.10.2); FILE MERGED (diff) | |
| download | core-e3ffb481262c5a0e5b2e765cfe6708b32138f432.tar.gz core-e3ffb481262c5a0e5b2e765cfe6708b32138f432.zip | |
INTEGRATION: CWS chart11 (1.23.2); FILE MERGED
2007/08/15 16:02:47 bm 1.23.2.2: #i64495# fixed by weiz. Adapt the selection after rearranging data series and remember former selection in an undo-action
2007/07/31 22:19:25 bm 1.23.2.1: #i79522# warnings on Solaris removed
Diffstat (limited to 'chart2/source/controller/main/ChartController.cxx')
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index c39a3f064375..9c9733f51cf3 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ChartController.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2007-07-25 08:42:25 $ + * last change: $Author: vg $ $Date: 2007-09-18 14:56:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -693,8 +693,8 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent //aGuard.reset(); m_bSuspended = bSuspend; - return sal_True; } + return sal_True; /* @@ -703,7 +703,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent else getFrame()->addFrameActionListener( pImp ); */ - return sal_True; } @@ -1250,7 +1249,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) uno::Reference< XDataSeries > xGivenDataSeries( ObjectIdentifier::getDataSeriesForCID( //yyy todo also legendentries and labels? aObjectCID, m_aModel->getModel() ) ); - UndoGuard aUndoGuard( + UndoGuardWithSelection aUndoGuard( ActionDescriptionProvider::createDescription( (bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM), ::rtl::OUString( String( SchResId( STR_OBJECT_DATASERIES )))), @@ -1258,7 +1257,10 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( m_aModel->getModel() ), xGivenDataSeries, bForward ); if( bChanged ) + { + m_aSelection.setSelection( ObjectIdentifier::getMovedSeriesCID( aObjectCID, bForward ) ); aUndoGuard.commitAction(); + } } // ____ XMultiServiceFactory ____ |