diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:17:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:17:05 +0000 |
| commit | d0590e168fc43386cb37b117924cc1ec3ebfe2d4 (patch) | |
| tree | 98dc228f7bb1efb924a6db57833cc215eb6c9c05 /svx/source/svdraw/svdview.cxx | |
| parent | 749c47099cef0a385104f377132cbe95f3df48e2 (diff) | |
INTEGRATION: CWS sb59 (1.16.60); FILE MERGED
2006/08/28 12:58:06 sb 1.16.60.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/svdraw/svdview.cxx')
| -rw-r--r-- | svx/source/svdraw/svdview.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c79a26b494b3..ddb3dd6f3b8d 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdview.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:02:01 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:17:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -355,7 +355,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co eHit=SDRHIT_HELPLINE; // Hilfslinie im Vordergrund getroffen zum verschieben } if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT) { - BOOL bRoot=pObj->HasMacro(); + bool bRoot=pObj->HasMacro(); BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro(); BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen? SdrObject* pMidObj=NULL; @@ -614,7 +614,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co rVEvt.eEvent=eEvent; rVEvt.bCaptureMouse=bMouseLeft && bMouseDown && eEvent!=SDREVENT_NONE; rVEvt.bReleaseMouse=bMouseLeft && bMouseUp; -#if DGB_UTIL +#ifdef DGB_UTIL if (rVEvt.pRootObj!=NULL) { if (rVEvt.pRootObj->GetObjList()!=rVEvt.pPV->GetObjList()) { DBG_ERROR("SdrView::PickAnything(): pRootObj->GetObjList()!=pPV->GetObjList() !"); |