diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:50:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:50:49 +0000 |
| commit | eef754f8614ec977a9c75ac738e0aa0986bb87a7 (patch) | |
| tree | 985169166a35a367fdbfeaf1aa9feb5836be9ea5 /svx | |
| parent | 1cce88ff207df90fcc52e8f20997c069311d7648 (diff) | |
INTEGRATION: CWS navorder (1.32.240); FILE MERGED
2007/08/28 08:57:23 af 1.32.240.3: #i68097# Resolved merge conflict.
2007/07/05 23:07:25 af 1.32.240.2: RESYNC: (1.32-1.33); FILE MERGED
2007/06/22 14:37:22 af 1.32.240.1: #i68097# Calling SdrObject::GetNavigationPosition() instead of GetOrdNum().
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 5c2f7b981dac..7d3b15f9c565 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdmrkv.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2007-07-18 10:56:51 $ + * last change: $Author: vg $ $Date: 2007-08-28 13:50:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1316,7 +1316,9 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) if (nMarkAnz!=0) { nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1); SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); - nSearchObjNum=pM->GetMarkedSdrObj()->GetOrdNum(); + OSL_ASSERT(pM!=NULL); + if (pM->GetMarkedSdrObj() != NULL) + nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition(); } SdrObject* pMarkObj=NULL; @@ -1324,11 +1326,15 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) ULONG nObjAnz=pSearchObjList->GetObjCount(); if (nObjAnz!=0) { if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz; - while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz))) { - if (!bPrev) nSearchObjNum--; - SdrObject* pSearchObj=pSearchObjList->GetObj(nSearchObjNum); - if (IsObjMarkable(pSearchObj,pPageView)) { - if (TryToFindMarkedObject(pSearchObj)==CONTAINER_ENTRY_NOTFOUND) { + while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz))) + { + if (!bPrev) + nSearchObjNum--; + SdrObject* pSearchObj = pSearchObjList->GetObjectForNavigationPosition(nSearchObjNum); + if (IsObjMarkable(pSearchObj,pPageView)) + { + if (TryToFindMarkedObject(pSearchObj)==CONTAINER_ENTRY_NOTFOUND) + { pMarkObj=pSearchObj; } } |