diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:12:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:12:54 +0000 |
| commit | dc461d575ab891fa94effe349e68483c1178438d (patch) | |
| tree | ed2e8e7c0b47d4923462c237d941d1b9ed437575 /svx/source/dialog/graphctl.cxx | |
| parent | 4160c8d7e8083c309615a73d853382ea4ab8a7b2 (diff) | |
INTEGRATION: CWS sb59 (1.23.60); FILE MERGED
2006/08/18 17:35:17 sb 1.23.60.2: RESYNC: (1.23-1.24); FILE MERGED
2006/08/18 12:02:47 sb 1.23.60.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/dialog/graphctl.cxx')
| -rw-r--r-- | svx/source/dialog/graphctl.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 44185ed58aa4..a2c95bc28d3e 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: graphctl.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:21:25 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:12:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -851,8 +851,10 @@ void GraphCtrl::SetEditMode( const BOOL _bEditMode ) { if ( bSdrMode ) { - pView->SetEditMode( bEditMode = _bEditMode ); - pView->SetCurrentObj( eObjKind = OBJ_NONE ); + bEditMode = _bEditMode; + pView->SetEditMode( bEditMode ); + eObjKind = OBJ_NONE; + pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); } else bEditMode = FALSE; @@ -887,8 +889,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) { if ( bSdrMode ) { - pView->SetEditMode( bEditMode = FALSE ); - pView->SetCurrentObj( eObjKind = _eObjKind ); + bEditMode = FALSE; + pView->SetEditMode( bEditMode ); + eObjKind = _eObjKind; + pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); } else eObjKind = OBJ_NONE; |