INTEGRATION: CWS aw024 (1.13.138); FILE MERGED

2006/09/21 19:26:21 aw 1.13.138.10: RESYNC: (1.17-1.18); FILE MERGED
2006/08/03 15:24:50 aw 1.13.138.9: RESYNC: (1.16-1.17); FILE MERGED
2006/07/07 16:03:16 aw 1.13.138.8: adaptions after resync SRC680m171->SRC680m174
2006/07/04 13:13:50 aw 1.13.138.7: RESYNC: (1.15-1.16); FILE MERGED
2006/01/26 22:09:59 aw 1.13.138.6: RESYNC: (1.14-1.15); FILE MERGED
2005/09/18 05:01:19 aw 1.13.138.5: RESYNC: (1.13-1.14); FILE MERGED
2005/05/26 11:28:03 aw 1.13.138.4: #i39531#
2005/05/25 09:50:54 aw 1.13.138.3: #i39529#
2005/05/19 12:31:29 aw 1.13.138.2: #i39529#
2005/05/12 16:39:32 aw 1.13.138.1: #i39529#

1 files changed, 22 insertions, 42 deletions

diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 2642b0530fa2..de7c75317368 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdedtv.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-12 13:08:10 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 13:40:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -121,7 +121,6 @@ void SdrEditView::ImpClearVars()
 {
     ImpResetPossibilityFlags();
     bPossibilitiesDirty=TRUE;   // << war von Purify angemeckert
-    bCombineError=FALSE;
     bBundleVirtObj=FALSE;
 }
 
@@ -131,12 +130,6 @@ SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
     ImpClearVars();
 }
 
-SdrEditView::SdrEditView(SdrModel* pModel1, XOutputDevice* _pXOut):
-    SdrMarkView(pModel1,_pXOut)
-{
-    ImpClearVars();
-}
-
 SdrEditView::~SdrEditView()
 {
 }
@@ -324,7 +317,6 @@ void SdrEditView::EndUndo()
 void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
 {
     const List& rAllMarkedObjects = GetTransitiveHullOfMarkedObjects();
-//  ForceEdgesOfMarkedNodes();
 
     // #i13033#
     // New mechanism to search for necessary disconnections for
@@ -509,9 +501,6 @@ void SdrEditView::CheckPossibilities()
                 BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL;
                 if (bGroup || bHasText) {
                     bCombinePossible=TRUE;
-                } else {
-                    // folgendes Statemant macht IMHO keinen Sinn (Bugfix am 27-11-1995 Combine und Fontwork):
-                    //bCombinePossible=pPath->GetPathPoly().Count()>1;
                 }
             }
             bCombineNoPolyPolyPossible=bCombinePossible;
@@ -553,13 +542,6 @@ void SdrEditView::CheckPossibilities()
                         bGradientAllowed = FALSE;
                     }
                 }
-
-                //if(SFX_ITEM_DONTCARE == rSet.GetItemState(XATTR_FILLSTYLE, FALSE))
-                //XFillStyle eFillStyle = ((XFillStyleItem&)(pObj->GetItem(XATTR_FILLSTYLE))).GetValue();
-                //if(eFillStyle != XFILL_GRADIENT)
-                //{
-                //  bGradientAllowed = FALSE;
-                //}
             }
 
             BOOL bNoMovRotFound=FALSE;
@@ -618,13 +600,16 @@ void SdrEditView::CheckPossibilities()
                 if (aInfo.bCanConvToPoly          ) bCanConvToPoly          =TRUE;
                 if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE;
                 if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE;
+
                 // Combine/Dismantle
-                if (bCombinePossible) {
-                    bCombinePossible=ImpCanConvertForCombine(pObj);
-                    bCombineNoPolyPolyPossible=bCombinePossible;
+                if(bCombinePossible)
+                {
+                    bCombinePossible = ImpCanConvertForCombine(pObj);
+                    bCombineNoPolyPolyPossible = bCombinePossible;
                 }
-                if (!bDismantlePossible) bDismantlePossible=ImpCanDismantle(pObj,FALSE);
-                if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible=ImpCanDismantle(pObj,TRUE);
+
+                if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
+                if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
                 // OrthoDesiredOnMarked checken
                 if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE;
                 // ImportMtf checken
@@ -680,20 +665,19 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         Rectangle aObjRect(pObj->GetCurrentBoundRect());
-        aObjRect+=pM->GetPageView()->GetOffset(); // auf View-Koordinaten
         Rectangle aPgRect(pM->GetPageView()->GetPageRect());
         if (!aObjRect.IsOver(aPgRect)) {
             BOOL bFnd=FALSE;
-            SdrPageView* pPV = NULL;
-            for (USHORT nv=GetPageViewCount(); nv>0 && !bFnd;) {
-                nv--;
-                pPV=GetPageViewPvNum(nv);
-                bFnd=aObjRect.IsOver(pPV->GetPageRect());
+            SdrPageView* pPV = GetSdrPageView();
+
+            if(pPV)
+            {
+                bFnd = aObjRect.IsOver(pPV->GetPageRect());
             }
-            if (bFnd) {
+
+            if(bFnd)
+            {
                 pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum());
-                Point aDelta(pM->GetPageView()->GetOffset()-pPV->GetOffset());
-                pObj->Move(Size(aDelta.X(),aDelta.Y()));
                 SdrInsertReason aReason(SDRREASON_VIEWCALL);
                 pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason);
                 pM->SetPageView(pPV);
@@ -740,10 +724,9 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark)
 
 void SdrEditView::DeleteMarkedObj()
 {
-    if (GetMarkedObjectCount()!=0) {
-        nSpecialCnt=0;
+    if (GetMarkedObjectCount()) {
         BrkAction();
-        HideMarkHdl(NULL);
+        HideMarkHdl();
         BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_DELETE);
         DeleteMarkedList(GetMarkedObjectList());
         GetMarkedObjectListWriteAccess().Clear();
@@ -756,7 +739,6 @@ void SdrEditView::DeleteMarkedObj()
 void SdrEditView::CopyMarkedObj()
 {
     SortMarkedObjects();
-    //ForceEdgesOfMarkedNodes();
 
     SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList());
     // Folgende Schleife Anstatt MarkList::Merge(), damit
@@ -786,8 +768,6 @@ void SdrEditView::CopyMarkedObj()
             AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoCopyObject(*pO));
             SdrMark aME(*pM);
             aME.SetMarkedSdrObj(pO);
-
-            // aCopiedObjects.InsertEntry(aME);
             aCloneList.AddPair(pM->GetMarkedSdrObj(), pO);
 
             if (pM->GetUser()==0)
@@ -829,7 +809,7 @@ void SdrEditView::CopyMarkedObj()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrEditView::InsertObject(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
+BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
 {
     if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
         SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
@@ -860,7 +840,7 @@ BOOL SdrEditView::InsertObject(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions
     return TRUE;
 }
 
-void SdrEditView::ReplaceObject(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark)
+void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark)
 {
     SdrObjList* pOL=pOldObj->GetObjList();
     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));