Skip to content

C
core
Kaydet (Commit) ee0c8634 authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS aw035 (1.22.44); FILE MERGED 

2006/07/12 15:29:53 aw 1.22.44.1: #126320# SdrMark::GetObj() -> SdrMark::GetSdrObjectFromSdrMark() for unique identification
üst 4df942ac
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
svx/source/svdraw/svdedtv1.cxx
Dosyayı görüntüle @ ee0c8634
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: svdedtv1.cxx,v $ * $RCSfile: svdedtv1.cxx,v $
* *
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* last change: $Author: hr $ $Date: 2006-06-19 16:35:48 $ * last change: $Author: rt $ $Date: 2006-07-25 12:55:20 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -132,7 +132,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) ...@@ -132,7 +132,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
if (bCopy) CopyMarkedObj(); if (bCopy) CopyMarkedObj();
for (ULONG nm=0; nm<nAnz; nm++) { for (ULONG nm=0; nm<nAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Rectangle aR1(pO->GetSnapRect()); Rectangle aR1(pO->GetSnapRect());
if (!aR1.IsEmpty()) { if (!aR1.IsEmpty()) {
...@@ -179,7 +179,7 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, BOOL bCopy) ...@@ -179,7 +179,7 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, BOOL bCopy)
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*pO,rSiz)); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*pO,rSiz));
pO->Move(rSiz); pO->Move(rSiz);
} }
...@@ -196,7 +196,7 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons ...@@ -196,7 +196,7 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Point aRef(rRef-pM->GetPageView()->GetOffset()); Point aRef(rRef-pM->GetPageView()->GetOffset());
pO->Resize(aRef,xFact,yFact); pO->Resize(aRef,xFact,yFact);
...@@ -212,7 +212,7 @@ long SdrEditView::GetMarkedObjRotate() const ...@@ -212,7 +212,7 @@ long SdrEditView::GetMarkedObjRotate() const
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
long nWink2=pO->GetRotateAngle(); long nWink2=pO->GetRotateAngle();
if (b1st) nWink=nWink2; if (b1st) nWink=nWink2;
else if (nWink2!=nWink) bOk=FALSE; else if (nWink2!=nWink) bOk=FALSE;
...@@ -234,7 +234,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, BOOL bCopy) ...@@ -234,7 +234,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, BOOL bCopy)
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Point aRef(rRef-pM->GetPageView()->GetOffset()); Point aRef(rRef-pM->GetPageView()->GetOffset());
pO->Rotate(aRef,nWink,nSin,nCos); pO->Rotate(aRef,nWink,nSin,nCos);
...@@ -256,7 +256,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, BOOL b ...@@ -256,7 +256,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, BOOL b
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Point aRef1b(rRef1-pM->GetPageView()->GetOffset()); Point aRef1b(rRef1-pM->GetPageView()->GetOffset());
Point aRef2b(rRef2-pM->GetPageView()->GetOffset()); Point aRef2b(rRef2-pM->GetPageView()->GetOffset());
...@@ -289,7 +289,7 @@ long SdrEditView::GetMarkedObjShear() const ...@@ -289,7 +289,7 @@ long SdrEditView::GetMarkedObjShear() const
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
long nWink2=pO->GetShearAngle(); long nWink2=pO->GetShearAngle();
if (b1st) nWink=nWink2; if (b1st) nWink=nWink2;
else if (nWink2!=nWink) bOk=FALSE; else if (nWink2!=nWink) bOk=FALSE;
...@@ -312,7 +312,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, BOOL bVShear, BO ...@@ -312,7 +312,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, BOOL bVShear, BO
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Point aRef(rRef); Point aRef(rRef);
Point aOfs(pM->GetPageView()->GetOffset()); Point aOfs(pM->GetPageView()->GetOffset());
...@@ -398,7 +398,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM ...@@ -398,7 +398,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Point aRef(rRef); Point aRef(rRef);
Point aOfs(pM->GetPageView()->GetOffset()); Point aOfs(pM->GetPageView()->GetOffset());
...@@ -452,7 +452,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto ...@@ -452,7 +452,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetObj(); SdrObject* pO=pM->GetMarkedSdrObj();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
Rectangle aRefRect(rRef); Rectangle aRefRect(rRef);
XPolygon aRefPoly(rDistortedRect); XPolygon aRefPoly(rDistortedRect);
...@@ -551,7 +551,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep ...@@ -551,7 +551,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
//const SdrPageView* pPV=pM->GetPageView(); //const SdrPageView* pPV=pM->GetPageView();
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
pObj->ApplyNotPersistAttr(rAttr); pObj->ApplyNotPersistAttr(rAttr);
...@@ -587,7 +587,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH ...@@ -587,7 +587,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrMark* pM=GetSdrMarkByIndex(nm);
const SdrObject* pObj=pM->GetObj(); const SdrObject* pObj=pM->GetMarkedSdrObj();
if (nm==0) { if (nm==0) {
nLayerId=pObj->GetLayer(); nLayerId=pObj->GetLayer();
bMovProtect=pObj->IsMoveProtect(); bMovProtect=pObj->IsMoveProtect();
...@@ -805,7 +805,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) ...@@ -805,7 +805,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
for (ULONG nm=0; nm<nMarkAnz; nm++) for (ULONG nm=0; nm<nMarkAnz; nm++)
{ {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj = pM->GetObj(); SdrObject* pObj = pM->GetMarkedSdrObj();
// new geometry undo // new geometry undo
if(bPossibleGeomChange) if(bPossibleGeomChange)
...@@ -877,7 +877,7 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const ...@@ -877,7 +877,7 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SfxStyleSheet* pSS=pM->GetObj()->GetStyleSheet(); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet();
if (b1st) pRet=pSS; if (b1st) pRet=pSS;
else if (pRet!=pSS) return NULL; // verschiedene StyleSheets else if (pRet!=pSS) return NULL; // verschiedene StyleSheets
b1st=FALSE; b1st=FALSE;
...@@ -895,9 +895,9 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe ...@@ -895,9 +895,9 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
ULONG nMarkAnz=GetMarkedObjectCount(); ULONG nMarkAnz=GetMarkedObjectCount();
for (ULONG nm=0; nm<nMarkAnz; nm++) { for (ULONG nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pM->GetObj())); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pM->GetMarkedSdrObj()));
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pM->GetObj(),true,true)); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pM->GetMarkedSdrObj(),true,true));
pM->GetObj()->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); pM->GetMarkedSdrObj()->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
} }
EndUndo(); EndUndo();
} }
...@@ -1011,13 +1011,13 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const ...@@ -1011,13 +1011,13 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
// Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind // Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind
const SdrMarkList& rMarkList=GetMarkedObjectList(); const SdrMarkList& rMarkList=GetMarkedObjectList();
ULONG nMarkCount=rMarkList.GetMarkCount(); ULONG nMarkCount=rMarkList.GetMarkCount();
SdrObject* pObj=rMarkList.GetMark(0)->GetObj(); SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj();
BOOL bPosProt=pObj->IsMoveProtect(); BOOL bPosProt=pObj->IsMoveProtect();
BOOL bSizProt=pObj->IsResizeProtect(); BOOL bSizProt=pObj->IsResizeProtect();
BOOL bPosProtDontCare=FALSE; BOOL bPosProtDontCare=FALSE;
BOOL bSizProtDontCare=FALSE; BOOL bSizProtDontCare=FALSE;
for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
pObj=rMarkList.GetMark(i)->GetObj(); pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE; if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE;
if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE; if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE;
} }
...@@ -1283,7 +1283,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) ...@@ -1283,7 +1283,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
{ {
BOOL bProtPos=((const SfxBoolItem*)pPoolItem)->GetValue(); BOOL bProtPos=((const SfxBoolItem*)pPoolItem)->GetValue();
for (ULONG i=0; i<nMarkCount; i++) { for (ULONG i=0; i<nMarkCount; i++) {
pObj=rMarkList.GetMark(i)->GetObj(); pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
pObj->SetMoveProtect(bProtPos); pObj->SetMoveProtect(bProtPos);
if( bProtPos ) if( bProtPos )
pObj->SetResizeProtect(true); pObj->SetResizeProtect(true);
...@@ -1303,7 +1303,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) ...@@ -1303,7 +1303,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
{ {
BOOL bProtSize=((const SfxBoolItem*)pPoolItem)->GetValue(); BOOL bProtSize=((const SfxBoolItem*)pPoolItem)->GetValue();
for (ULONG i=0; i<nMarkCount; i++) { for (ULONG i=0; i<nMarkCount; i++) {
pObj=rMarkList.GetMark(i)->GetObj(); pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
pObj->SetResizeProtect(bProtSize); pObj->SetResizeProtect(bProtSize);
} }
// BugFix 13897: hier muesste besser ein Broadcast her! // BugFix 13897: hier muesste besser ein Broadcast her!
...@@ -1358,7 +1358,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL ...@@ -1358,7 +1358,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
BOOL bHasFixed=FALSE; BOOL bHasFixed=FALSE;
for (nm=0; nm<nMarkAnz; nm++) { for (nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObjTransformInfoRec aInfo; SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo); pObj->TakeObjInfo(aInfo);
if (!aInfo.bMoveAllowed || pObj->IsMoveProtect()) { if (!aInfo.bMoveAllowed || pObj->IsMoveProtect()) {
...@@ -1393,7 +1393,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL ...@@ -1393,7 +1393,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
Point aCenter(aBound.Center()); Point aCenter(aBound.Center());
for (nm=0; nm<nMarkAnz; nm++) { for (nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObjTransformInfoRec aInfo; SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo); pObj->TakeObjInfo(aInfo);
if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) { if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) {
......
svx/source/svdraw/svdedtv2.cxx
Dosyayı görüntüle @ ee0c8634
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: svdedtv2.cxx,v $ * $RCSfile: svdedtv2.cxx,v $
* *
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* last change: $Author: hr $ $Date: 2006-06-19 16:36:05 $ * last change: $Author: rt $ $Date: 2006-07-25 12:55:34 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -141,7 +141,7 @@ void SdrEditView::MovMarkedToTop() ...@@ -141,7 +141,7 @@ void SdrEditView::MovMarkedToTop()
for (nm=nAnz; nm>0;) { for (nm=nAnz; nm>0;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0) { if (pOL!=pOL0) {
nNewPos=ULONG(pOL->GetObjCount()-1); nNewPos=ULONG(pOL->GetObjCount()-1);
...@@ -223,7 +223,7 @@ void SdrEditView::MovMarkedToBtm() ...@@ -223,7 +223,7 @@ void SdrEditView::MovMarkedToBtm()
ULONG nNewPos=0; ULONG nNewPos=0;
for (nm=0; nm<nAnz; nm++) { for (nm=0; nm<nAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0) { if (pOL!=pOL0) {
nNewPos=0; nNewPos=0;
...@@ -331,7 +331,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) ...@@ -331,7 +331,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
for (nm=nAnz; nm>0;) { for (nm=nAnz; nm>0;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
if (pObj!=pRefObj) { if (pObj!=pRefObj) {
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0) { if (pOL!=pOL0) {
...@@ -415,7 +415,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) ...@@ -415,7 +415,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
ULONG nNewPos=0; ULONG nNewPos=0;
for (nm=0; nm<nAnz; nm++) { for (nm=0; nm<nAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
if (pObj!=pRefObj) { if (pObj!=pRefObj) {
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0) { if (pOL!=pOL0) {
...@@ -800,7 +800,7 @@ void SdrEditView::DistributeMarkedObjects() ...@@ -800,7 +800,7 @@ void SdrEditView::DistributeMarkedObjects()
SdrMark* pMark = GetSdrMarkByIndex(a); SdrMark* pMark = GetSdrMarkByIndex(a);
ImpDistributeEntry* pNew = new ImpDistributeEntry; ImpDistributeEntry* pNew = new ImpDistributeEntry;
pNew->mpObj = pMark->GetObj(); pNew->mpObj = pMark->GetMarkedSdrObj();
nInsPos = 0; nInsPos = 0;
switch(eHor) switch(eHor)
...@@ -889,7 +889,7 @@ void SdrEditView::DistributeMarkedObjects() ...@@ -889,7 +889,7 @@ void SdrEditView::DistributeMarkedObjects()
SdrMark* pMark = GetSdrMarkByIndex(a); SdrMark* pMark = GetSdrMarkByIndex(a);
ImpDistributeEntry* pNew = new ImpDistributeEntry; ImpDistributeEntry* pNew = new ImpDistributeEntry;
pNew->mpObj = pMark->GetObj(); pNew->mpObj = pMark->GetMarkedSdrObj();
nInsPos = 0; nInsPos = 0;
switch(eVer) switch(eVer)
...@@ -1009,7 +1009,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) ...@@ -1009,7 +1009,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
for(UINT32 a=0;a<GetMarkedObjectCount();a++) for(UINT32 a=0;a<GetMarkedObjectCount();a++)
{ {
SdrMark* pM = GetSdrMarkByIndex(a); SdrMark* pM = GetSdrMarkByIndex(a);
SdrObject* pObj = pM->GetObj(); SdrObject* pObj = pM->GetMarkedSdrObj();
if(ImpCanConvertForCombine(pObj)) if(ImpCanConvertForCombine(pObj))
{ {
...@@ -1263,7 +1263,7 @@ BOOL SdrEditView::CombineMarkedObjects(BOOL bNoPolyPoly) ...@@ -1263,7 +1263,7 @@ BOOL SdrEditView::CombineMarkedObjects(BOOL bNoPolyPoly)
for (nm=nAnz; nm>0 && !bCombineError;) { for (nm=nAnz; nm>0 && !bCombineError;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObjList* pThisOL=pObj->GetObjList(); SdrObjList* pThisOL=pObj->GetObjList();
if (pAktOL!=pThisOL) { if (pAktOL!=pThisOL) {
pAktOL=pThisOL; pAktOL=pThisOL;
...@@ -1597,7 +1597,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) ...@@ -1597,7 +1597,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
for (nm=nAnz; nm>0;) { for (nm=nAnz; nm>0;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView(); SdrPageView* pPV=pM->GetPageView();
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen! if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen!
...@@ -1644,7 +1644,7 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) ...@@ -1644,7 +1644,7 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
for (ULONG nm=nAnz; nm>0;) { // UndoActions fuer alle betroffenen Objekte anlegen for (ULONG nm=nAnz; nm>0;) { // UndoActions fuer alle betroffenen Objekte anlegen
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoRemoveObject(*pM->GetObj())); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoRemoveObject(*pM->GetMarkedSdrObj()));
} }
SdrMarkList aNewMark; SdrMarkList aNewMark;
...@@ -1674,7 +1674,7 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) ...@@ -1674,7 +1674,7 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
pDstLst=pGrp->GetSubList(); pDstLst=pGrp->GetSubList();
DBG_ASSERT(pDstLst!=NULL,"Angebliches Gruppenobjekt liefert keine Objektliste"); DBG_ASSERT(pDstLst!=NULL,"Angebliches Gruppenobjekt liefert keine Objektliste");
} }
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
pSrcLst=pObj->GetObjList(); pSrcLst=pObj->GetObjList();
if (pSrcLst!=pSrcLst0) { if (pSrcLst!=pSrcLst0) {
if (pSrcLst->IsObjOrdNumsDirty()) pSrcLst->RecalcObjOrdNums(); if (pSrcLst->IsObjOrdNumsDirty()) pSrcLst->RecalcObjOrdNums();
...@@ -1738,7 +1738,7 @@ void SdrEditView::UnGroupMarked() ...@@ -1738,7 +1738,7 @@ void SdrEditView::UnGroupMarked()
for (ULONG nm=GetMarkedObjectCount(); nm>0;) { for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pGrp=pM->GetObj(); SdrObject* pGrp=pM->GetMarkedSdrObj();
SdrObjList* pSrcLst=pGrp->GetSubList(); SdrObjList* pSrcLst=pGrp->GetSubList();
if (pSrcLst!=NULL) { if (pSrcLst!=NULL) {
nCount++; nCount++;
...@@ -1859,7 +1859,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) ...@@ -1859,7 +1859,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
for (ULONG nm=nMarkAnz; nm>0;) { for (ULONG nm=nMarkAnz; nm>0;) {
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView(); SdrPageView* pPV=pM->GetPageView();
if (pObj->IsGroupObject() && !pObj->Is3DObj()) { if (pObj->IsGroupObject() && !pObj->Is3DObj()) {
SdrObject* pGrp=pObj; SdrObject* pGrp=pObj;
...@@ -1923,7 +1923,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) ...@@ -1923,7 +1923,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
nm--; nm--;
SdrMark* pM=GetSdrMarkByIndex(nm); SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetObj(); SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView(); SdrPageView* pPV=pM->GetPageView();
SdrObjList* pOL=pObj->GetObjList(); SdrObjList* pOL=pObj->GetObjList();
ULONG nInsPos=pObj->GetOrdNum()+1; ULONG nInsPos=pObj->GetOrdNum()+1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment