diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:11:09 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:11:09 +0000 |
commit | 629b6ba3fa2f6c8cceb3add2be96581ffa833860 (patch) | |
tree | 08f30bd6636c0f0d633010ae934b6bcb7796c6d5 /svx/source/svdraw/svdmrkv.cxx | |
parent | cec87e4f3363707b199769c5fd68f22b3fa51858 (diff) |
INTEGRATION: CWS sb59 (1.27.48); FILE MERGED
2006/08/28 12:58:02 sb 1.27.48.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svx/source/svdraw/svdmrkv.cxx')
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f4e601e269..797ac84cf4 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdmrkv.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:52:54 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:11:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -865,7 +865,7 @@ void SdrMarkView::SetMarkHandles() ULONG nSiz0=aHdl.GetHdlCount(); pObj->AddToHdlList(aHdl); ULONG nSiz1=aHdl.GetHdlCount(); - BOOL bPoly=pObj->IsPolyObj(); + bool bPoly=pObj->IsPolyObj(); const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints(); for (ULONG i=nSiz0; i<nSiz1; i++) { SdrHdl* pHdl=aHdl.GetHdl(i); @@ -1478,7 +1478,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) // #110988# //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum(); sal_uInt32 nSearchBeg; - E3dScene* pScene; + E3dScene* pScene = NULL; SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit; sal_Bool bRemap = pObjHit->ISA(E3dCompoundObject) ? ((E3dCompoundObject*)pObjHit)->IsAOrdNumRemapCandidate(pScene) |