diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-25 07:42:58 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-25 07:42:58 +0000 |
commit | c13d6e33a74857d72b944cafa85291505e9f0b1a (patch) | |
tree | 0ec0726e9b3366958b2f1aba582efc73bdf79dd4 /chart2/source/controller/main/ChartController_EditData.cxx | |
parent | INTEGRATION: CWS chart07 (1.7.12); FILE MERGED (diff) | |
download | core-c13d6e33a74857d72b944cafa85291505e9f0b1a.tar.gz core-c13d6e33a74857d72b944cafa85291505e9f0b1a.zip |
INTEGRATION: CWS chart07 (1.5.12); FILE MERGED
2007/06/26 11:09:57 bm 1.5.12.2: #i78790# fix for (broken) gcc 3.3 for Mac OS/X Panther applied
2007/06/25 12:52:11 bm 1.5.12.1: #i74653# store undo manager at model to be able to do an undo even after inplace re-activation
Diffstat (limited to 'chart2/source/controller/main/ChartController_EditData.cxx')
-rw-r--r-- | chart2/source/controller/main/ChartController_EditData.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index f7791544aca8..0d54896f675b 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ChartController_EditData.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2007-05-22 18:03:19 $ + * last change: $Author: rt $ $Date: 2007-07-25 08:42:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,9 +82,10 @@ void ChartController::executeDispatch_EditData() { // /-- ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - UndoLiveUpdateGuardWithData aUndoGuard( + // using assignment for broken gcc 3.3 + UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData( ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHART_DATA ))), - m_aUndoManager, m_aModel->getModel()); + m_xUndoManager, m_aModel->getModel()); DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC ); // the dialog has no OK/Cancel aDataEditorDialog.Execute(); |