diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:58:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:58:27 +0000 |
| commit | a87dddb90e874187bc102df7889c6030b497f91d (patch) | |
| tree | 9f2fcdf8708745c381f23558f91ea3caff0b9550 /chart2/source/controller/main | |
| parent | INTEGRATION: CWS chart23 (1.9.78); FILE MERGED (diff) | |
| download | core-a87dddb90e874187bc102df7889c6030b497f91d.tar.gz core-a87dddb90e874187bc102df7889c6030b497f91d.zip | |
INTEGRATION: CWS chart23 (1.27.6); FILE MERGED
2008/03/12 14:05:44 iha 1.27.6.2: RESYNC: (1.27-1.28); FILE MERGED
2008/02/22 13:55:18 iha 1.27.6.1: #i86355# crash in debug version when moving chart elements via mouse
Diffstat (limited to 'chart2/source/controller/main')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index cf0bb90ffa9d..e3d6f40b9335 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ChartController_Window.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: kz $ $Date: 2008-03-06 17:00:53 $ + * last change: $Author: kz $ $Date: 2008-04-04 10:58:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -681,6 +681,7 @@ void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ ) void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) { + ControllerLockGuard aCLGuard( m_aModel->getModel()); m_bWaitingForMouseUp = false; bool bNotifySelectionChange = false; { @@ -707,14 +708,13 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) DragMethod_Base* pChartDragMethod = dynamic_cast< DragMethod_Base* >(pDragMethod); if( pChartDragMethod ) { - ControllerLockGuard aCLGuard( m_aModel->getModel()); UndoGuard aUndoGuard( pChartDragMethod->getUndoDescription(), m_xUndoManager, m_aModel->getModel() ); if( pDrawViewWrapper->EndDragObj(false) ) { - aUndoGuard.commitAction(); bDraggingDone = true; + aUndoGuard.commitAction(); } } |