sw/source/core/undo/undraw.cxx

   1 /*************************************************************************
   2  *
   3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4  *
   5  * Copyright 2008 by Sun Microsystems, Inc.
   6  *
   7  * OpenOffice.org - a multi-platform office productivity suite
   8  *
   9  * $RCSfile: undraw.cxx,v $
  10  * $Revision: 1.22 $
  11  *
  12  * This file is part of OpenOffice.org.
  13  *
  14  * OpenOffice.org is free software: you can redistribute it and/or modify
  15  * it under the terms of the GNU Lesser General Public License version 3
  16  * only, as published by the Free Software Foundation.
  17  *
  18  * OpenOffice.org is distributed in the hope that it will be useful,
  19  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  20  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  21  * GNU Lesser General Public License version 3 for more details
  22  * (a copy is included in the LICENSE file that accompanied this code).
  23  *
  24  * You should have received a copy of the GNU Lesser General Public License
  25  * version 3 along with OpenOffice.org.  If not, see
  26  * <http://www.openoffice.org/license.html>
  27  * for a copy of the LGPLv3 License.
  28  *
  29  ************************************************************************/
  30
  31 // MARKER(update_precomp.py): autogen include statement, do not remove
  32 #include "precompiled_sw.hxx"
  33
  34 #include <rtl/string.h>
  35
  36 #ifndef _RTL_MEMORY_H
  37 #include <rtl/memory.h>
  38 #endif
  39 #include <hintids.hxx>
  40
  41 #ifndef _RTL_STRING_H
  42 #include <rtl/string.h>
  43 #endif
  44 #include <svx/svdogrp.hxx>
  45 #include <svx/svdundo.hxx>
  46 #include <svx/svdpage.hxx>
  47 #include <svx/svdmark.hxx>
  48 #include <fmtanchr.hxx>
  49 #include <fmtflcnt.hxx>
  50 #include <txtflcnt.hxx>
  51 #include <frmfmt.hxx>
  52 #include <doc.hxx>
  53 #include <docary.hxx>
  54 #include <frame.hxx>
  55 #include <swundo.hxx>                   // fuer die UndoIds
  56 #include <pam.hxx>
  57 #include <ndtxt.hxx>
  58 #include <undobj.hxx>
  59 #include <dcontact.hxx>
  60 #include <dview.hxx>
  61 #include <rootfrm.hxx>
  62 #include <viewsh.hxx>
  63
  64 struct SwUndoGroupObjImpl
  65 {
  66     SwDrawFrmFmt* pFmt;
  67     SdrObject* pObj;
  68     ULONG nNodeIdx;
  69
  70     // OD 2004-04-15 #i26791# - keeping the anchor and the relative position
  71     // of drawing objects no longer needed
  72 };
  73
  74
  75 inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
  76
  77 // Draw-Objecte
  78
  79 IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo )
  80 {
  81 #if OSL_DEBUG_LEVEL > 1
  82     USHORT nId = pUndo->GetId();
  83     (void)nId;
  84     String sComment( pUndo->GetComment() );
  85 #endif
  86
  87     if( DoesUndo() && !IsNoDrawUndoObj() )
  88     {
  89         ClearRedo();
  90         const SdrMarkList* pMarkList = 0;
  91         ViewShell* pSh = GetRootFrm() ? GetRootFrm()->GetCurrShell() : 0;
  92         if( pSh && pSh->HasDrawView() )
  93             pMarkList = &pSh->GetDrawView()->GetMarkedObjectList();
  94
  95         AppendUndo( new SwSdrUndo( pUndo, pMarkList ) );
  96     }
  97     else
  98         delete pUndo;
  99     return 0;
 100 }
 101
 102 SwSdrUndo::SwSdrUndo( SdrUndoAction* pUndo, const SdrMarkList* pMrkLst )
 103     : SwUndo( UNDO_DRAWUNDO ), pSdrUndo( pUndo )
 104 {
 105     if( pMrkLst && pMrkLst->GetMarkCount() )
 106         pMarkList = new SdrMarkList( *pMrkLst );
 107     else
 108         pMarkList = 0;
 109 }
 110
 111 SwSdrUndo::~SwSdrUndo()
 112 {
 113     delete pSdrUndo;
 114     delete pMarkList;
 115 }
 116
 117 void SwSdrUndo::Undo( SwUndoIter& rUndoIter )
 118 {
 119     pSdrUndo->Undo();
 120     rUndoIter.pMarkList = pMarkList;
 121 }
 122
 123 void SwSdrUndo::Redo( SwUndoIter& rUndoIter )
 124 {
 125     pSdrUndo->Redo();
 126     rUndoIter.pMarkList = pMarkList;
 127 }
 128
 129 String SwSdrUndo::GetComment() const
 130 {
 131     return pSdrUndo->GetComment();
 132 }
 133
 134 //--------------------------------------------
 135
 136 void lcl_SendRemoveToUno( SwFmt& rFmt )
 137 {
 138     SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFmt );
 139     rFmt.Modify( &aMsgHint, &aMsgHint );
 140 }
 141
 142 void lcl_SaveAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 143 {
 144     const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
 145     if( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
 146         FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ||
 147         FLY_AT_FLY == rAnchor.GetAnchorId() ||
 148         FLY_IN_CNTNT == rAnchor.GetAnchorId() )
 149     {
 150         rNodePos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
 151         xub_StrLen nCntntPos = 0;
 152
 153         if( FLY_IN_CNTNT == rAnchor.GetAnchorId() )
 154         {
 155             nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
 156
 157             // TextAttribut zerstoeren
 158             SwTxtNode *pTxtNd = pFmt->GetDoc()->GetNodes()[ rNodePos ]->GetTxtNode();
 159             ASSERT( pTxtNd, "Kein Textnode gefunden" );
 160             SwTxtFlyCnt* pAttr = (SwTxtFlyCnt*)pTxtNd->GetTxtAttr( nCntntPos );
 161             // Attribut steht noch im TextNode, loeschen
 162             if( pAttr && pAttr->GetFlyCnt().GetFrmFmt() == pFmt )
 163             {
 164                 // Pointer auf 0, nicht loeschen
 165                 ((SwFmtFlyCnt&)pAttr->GetFlyCnt()).SetFlyFmt();
 166                 SwIndex aIdx( pTxtNd, nCntntPos );
 167                 pTxtNd->Erase( aIdx, 1 );
 168             }
 169         }
 170         else if( FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
 171             nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
 172
 173         pFmt->SetFmtAttr( SwFmtAnchor( rAnchor.GetAnchorId(), nCntntPos ) );
 174     }
 175 }
 176
 177 void lcl_RestoreAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 178 {
 179     const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
 180     if( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
 181         FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ||
 182         FLY_AT_FLY == rAnchor.GetAnchorId() ||
 183         FLY_IN_CNTNT == rAnchor.GetAnchorId() )
 184     {
 185         xub_StrLen nCntntPos = rAnchor.GetPageNum();
 186         SwNodes& rNds = pFmt->GetDoc()->GetNodes();
 187
 188         SwNodeIndex aIdx( rNds, rNodePos );
 189         SwPosition aPos( aIdx );
 190
 191         SwFmtAnchor aTmp( rAnchor.GetAnchorId() );
 192         if( FLY_IN_CNTNT == rAnchor.GetAnchorId() ||
 193             FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
 194             aPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), nCntntPos );
 195         aTmp.SetAnchor( &aPos );
 196         pFmt->SetFmtAttr( aTmp );
 197
 198         if( FLY_IN_CNTNT == rAnchor.GetAnchorId() )
 199         {
 200             SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
 201             ASSERT( pTxtNd, "Kein Textnode gefunden" );
 202             pTxtNd->InsertItem( SwFmtFlyCnt( (SwFrmFmt*)pFmt ),
 203                                 nCntntPos, nCntntPos );
 204         }
 205     }
 206 }
 207
 208 SwUndoDrawGroup::SwUndoDrawGroup( USHORT nCnt )
 209     : SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFmt( TRUE )
 210 {
 211     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 212 }
 213
 214 SwUndoDrawGroup::~SwUndoDrawGroup()
 215 {
 216     if( bDelFmt )
 217     {
 218         SwUndoGroupObjImpl* pTmp = pObjArr + 1;
 219         for( USHORT n = 1; n < nSize; ++n, ++pTmp )
 220             delete pTmp->pFmt;
 221     }
 222     else
 223         delete pObjArr->pFmt;           // das GroupObject-Format
 224
 225     delete [] pObjArr;
 226 }
 227
 228 void SwUndoDrawGroup::Undo( SwUndoIter& )
 229 {
 230     bDelFmt = FALSE;
 231
 232     // das Group-Object sichern
 233     SwDrawFrmFmt* pFmt = pObjArr->pFmt;
 234     SwDrawContact* pDrawContact = (SwDrawContact*)pFmt->FindContactObj();
 235     SdrObject* pObj     = pDrawContact->GetMaster();
 236     pObjArr->pObj = pObj;
 237
 238     //loescht sich selbst!
 239     pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
 240     pObj->SetUserCall( 0 );
 241
 242     ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
 243
 244     // alle Uno-Objecte sollten sich jetzt abmelden
 245     ::lcl_SendRemoveToUno( *pFmt );
 246
 247     // aus dem Array austragen
 248     SwDoc* pDoc = pFmt->GetDoc();
 249     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts();
 250     rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 251
 252     for( USHORT n = 1; n < nSize; ++n )
 253     {
 254         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 255
 256         ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
 257         rFlyFmts.Insert( rSave.pFmt, rFlyFmts.Count() );
 258
 259         pObj = rSave.pObj;
 260
 261         SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
 262         pContact->ConnectToLayout();
 263         // --> OD 2005-03-22 #i45718# - follow-up of #i35635#
 264         // move object to visible layer
 265         pContact->MoveObjToVisibleLayer( pObj );
 266         // <--
 267         // --> OD 2005-05-10 #i45952# - notify that position attributes
 268         // are already set
 269         ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
 270                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
 271         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
 272         {
 273             static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
 274         }
 275         // <--
 276     }
 277 }
 278
 279 void SwUndoDrawGroup::Redo( SwUndoIter& )
 280 {
 281     bDelFmt = TRUE;
 282
 283     // aus dem Array austragen
 284     SwDoc* pDoc = pObjArr->pFmt->GetDoc();
 285     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts();
 286     SdrObject* pObj;
 287
 288     for( USHORT n = 1; n < nSize; ++n )
 289     {
 290         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 291
 292         pObj = rSave.pObj;
 293
 294         SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 295         //loescht sich selbst!
 296         pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
 297         pObj->SetUserCall( 0 );
 298
 299         ::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
 300
 301         // alle Uno-Objecte sollten sich jetzt abmelden
 302         ::lcl_SendRemoveToUno( *rSave.pFmt );
 303
 304         rFlyFmts.Remove( rFlyFmts.GetPos( rSave.pFmt ));
 305     }
 306
 307     // das Group-Object wieder einfuegen
 308     ::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
 309     rFlyFmts.Insert( pObjArr->pFmt, rFlyFmts.Count() );
 310
 311     SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
 312     // OD 2004-04-15 #i26791# - correction: connect object to layout
 313     pContact->ConnectToLayout();
 314     // --> OD 2005-03-22 #i45718# - follow-up of #i35635#
 315     // move object to visible layer
 316     pContact->MoveObjToVisibleLayer( pObjArr->pObj );
 317     // <--
 318     // --> OD 2005-05-10 #i45952# - notify that position attributes
 319     // are already set
 320     ASSERT( pObjArr->pFmt->ISA(SwDrawFrmFmt),
 321             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
 322     if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
 323     {
 324         static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
 325     }
 326     // <--
 327 }
 328
 329 void SwUndoDrawGroup::AddObj( USHORT nPos, SwDrawFrmFmt* pFmt, SdrObject* pObj )
 330 {
 331     SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
 332     rSave.pObj = pObj;
 333     rSave.pFmt = pFmt;
 334     ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
 335
 336     // alle Uno-Objecte sollten sich jetzt abmelden
 337     ::lcl_SendRemoveToUno( *pFmt );
 338
 339     // aus dem Array austragen
 340     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pFmt->GetDoc()->GetSpzFrmFmts();
 341     rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 342 }
 343
 344 void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt )
 345 {
 346     pObjArr->pObj = 0;
 347     pObjArr->pFmt = pFmt;
 348 }
 349
 350
 351 // ------------------------------
 352
 353 SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj )
 354     : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( FALSE )
 355 {
 356     nSize = (USHORT)pObj->GetSubList()->GetObjCount() + 1;
 357     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 358
 359     SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 360     SwDrawFrmFmt* pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
 361
 362     pObjArr->pObj = pObj;
 363     pObjArr->pFmt = pFmt;
 364
 365     //loescht sich selbst!
 366     pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
 367     pObj->SetUserCall( 0 );
 368
 369     ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
 370
 371     // alle Uno-Objecte sollten sich jetzt abmelden
 372     ::lcl_SendRemoveToUno( *pFmt );
 373
 374     // aus dem Array austragen
 375     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pFmt->GetDoc()->GetSpzFrmFmts();
 376     rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 377 }
 378
 379 SwUndoDrawUnGroup::~SwUndoDrawUnGroup()
 380 {
 381     if( bDelFmt )
 382     {
 383         SwUndoGroupObjImpl* pTmp = pObjArr + 1;
 384         for( USHORT n = 1; n < nSize; ++n, ++pTmp )
 385             delete pTmp->pFmt;
 386     }
 387     else
 388         delete pObjArr->pFmt;           // das GroupObject-Format
 389
 390     delete [] pObjArr;
 391 }
 392
 393 void SwUndoDrawUnGroup::Undo( SwUndoIter& rIter )
 394 {
 395     bDelFmt = TRUE;
 396
 397     // aus dem Array austragen
 398     SwDoc* pDoc = &rIter.GetDoc();
 399     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts();
 400
 401     for( USHORT n = 1; n < nSize; ++n )
 402     {
 403         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 404
 405         // --> OD 2006-11-01 #130889# - taken over by <SwUndoDrawUnGroupConnectToLayout>
 406 //        SwDrawContact* pContact = (SwDrawContact*)rSave.pFmt->FindContactObj();
 407
 408 //        rSave.pObj = pContact->GetMaster();
 409
 410 //        //loescht sich selbst!
 411 //        pContact->Changed( *rSave.pObj, SDRUSERCALL_DELETE,
 412 //                           rSave.pObj->GetLastBoundRect() );
 413 //        rSave.pObj->SetUserCall( 0 );
 414         // <--
 415
 416         ::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
 417
 418         // alle Uno-Objecte sollten sich jetzt abmelden
 419         ::lcl_SendRemoveToUno( *rSave.pFmt );
 420
 421         rFlyFmts.Remove( rFlyFmts.GetPos( rSave.pFmt ));
 422     }
 423
 424     // das Group-Object wieder einfuegen
 425     ::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
 426     rFlyFmts.Insert( pObjArr->pFmt, rFlyFmts.Count() );
 427
 428     SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
 429     pContact->ConnectToLayout();
 430     // --> OD 2005-03-22 #i45718# - follow-up of #i35635#
 431     // move object to visible layer
 432     pContact->MoveObjToVisibleLayer( pObjArr->pObj );
 433     // <--
 434     // --> OD 2005-05-10 #i45952# - notify that position attributes
 435     // are already set
 436     ASSERT( pObjArr->pFmt->ISA(SwDrawFrmFmt),
 437             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
 438     if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
 439     {
 440         static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
 441     }
 442     // <--
 443 }
 444
 445 void SwUndoDrawUnGroup::Redo( SwUndoIter& )
 446 {
 447     bDelFmt = FALSE;
 448
 449     // das Group-Object sichern
 450     SwDrawFrmFmt* pFmt = pObjArr->pFmt;
 451     SwDrawContact* pContact = (SwDrawContact*)pFmt->FindContactObj();
 452
 453     //loescht sich selbst!
 454     pContact->Changed( *pObjArr->pObj, SDRUSERCALL_DELETE,
 455         pObjArr->pObj->GetLastBoundRect() );
 456     pObjArr->pObj->SetUserCall( 0 );
 457
 458     ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
 459
 460     // alle Uno-Objecte sollten sich jetzt abmelden
 461     ::lcl_SendRemoveToUno( *pFmt );
 462
 463     // aus dem Array austragen
 464     SwDoc* pDoc = pFmt->GetDoc();
 465     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts();
 466     rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 467
 468     for( USHORT n = 1; n < nSize; ++n )
 469     {
 470         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 471
 472         ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
 473         rFlyFmts.Insert( rSave.pFmt, rFlyFmts.Count() );
 474
 475         // --> OD 2006-11-01 #130889# - taken over by <SwUndoDrawUnGroupConnectToLayout>
 476 //        SdrObject* pObj = rSave.pObj;
 477
 478 //        SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, rSave.pObj );
 479 //        pContact->ConnectToLayout();
 480 //        // --> OD 2005-03-22 #i45718# - follow-up of #i35635#
 481 //        // move object to visible layer
 482 //        pContact->MoveObjToVisibleLayer( rSave.pObj );
 483 //        // <--
 484         // <--
 485         // --> OD 2005-05-10 #i45952# - notify that position attributes
 486         // are already set
 487         ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
 488                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
 489         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
 490         {
 491             static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
 492         }
 493         // <--
 494     }
 495 }
 496
 497 void SwUndoDrawUnGroup::AddObj( USHORT nPos, SwDrawFrmFmt* pFmt )
 498 {
 499     SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
 500     rSave.pFmt = pFmt;
 501     rSave.pObj = 0;
 502 }
 503
 504 //-------------------------------------
 505 // --> OD 2006-11-01 #130889#
 506 SwUndoDrawUnGroupConnectToLayout::SwUndoDrawUnGroupConnectToLayout()
 507     : SwUndo( UNDO_DRAWUNGROUP )
 508 {
 509 }
 510
 511 SwUndoDrawUnGroupConnectToLayout::~SwUndoDrawUnGroupConnectToLayout()
 512 {
 513 }
 514
 515 void SwUndoDrawUnGroupConnectToLayout::Undo( SwUndoIter& )
 516 {
 517     for ( std::vector< SdrObject >::size_type i = 0;
 518           i < aDrawFmtsAndObjs.size(); ++i )
 519     {
 520         SdrObject* pObj( aDrawFmtsAndObjs[i].second );
 521         SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(pObj->GetUserCall()) );
 522         ASSERT( pDrawContact,
 523                 "<SwUndoDrawUnGroupConnectToLayout::Undo(..)> -- missing SwDrawContact instance" );
 524         if ( pDrawContact )
 525         {
 526             // deletion of instance <pDrawContact> and thus disconnection from
 527             // the Writer layout.
 528             pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
 529             pObj->SetUserCall( 0 );
 530         }
 531     }
 532 }
 533
 534 void SwUndoDrawUnGroupConnectToLayout::Redo( SwUndoIter& )
 535 {
 536     for ( std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >::size_type i = 0;
 537           i < aDrawFmtsAndObjs.size(); ++i )
 538     {
 539         SwDrawFrmFmt* pFmt( aDrawFmtsAndObjs[i].first );
 540         SdrObject* pObj( aDrawFmtsAndObjs[i].second );
 541         SwDrawContact *pContact = new SwDrawContact( pFmt, pObj );
 542         pContact->ConnectToLayout();
 543         pContact->MoveObjToVisibleLayer( pObj );
 544     }
 545 }
 546
 547 void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
 548                                                      SdrObject* pDrawObject )
 549 {
 550     aDrawFmtsAndObjs.push_back(
 551             std::pair< SwDrawFrmFmt*, SdrObject* >( pDrawFrmFmt, pDrawObject ) );
 552 }
 553 // <--
 554
 555 //-------------------------------------
 556
 557 SwUndoDrawDelete::SwUndoDrawDelete( USHORT nCnt )
 558     : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( TRUE )
 559 {
 560     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 561     pMarkLst = new SdrMarkList();
 562 }
 563
 564 SwUndoDrawDelete::~SwUndoDrawDelete()
 565 {
 566     if( bDelFmt )
 567     {
 568         SwUndoGroupObjImpl* pTmp = pObjArr;
 569         for( USHORT n = 0; n < pMarkLst->GetMarkCount(); ++n, ++pTmp )
 570             delete pTmp->pFmt;
 571     }
 572     delete [] pObjArr;
 573     delete pMarkLst;
 574 }
 575
 576 void SwUndoDrawDelete::Undo( SwUndoIter &rIter )
 577 {
 578     bDelFmt = FALSE;
 579     SwSpzFrmFmts& rFlyFmts = *rIter.GetDoc().GetSpzFrmFmts();
 580     for( USHORT n = 0; n < pMarkLst->GetMarkCount(); ++n )
 581     {
 582         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 583         ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
 584         rFlyFmts.Insert( rSave.pFmt, rFlyFmts.Count() );
 585         SdrObject *pObj = rSave.pObj;
 586         SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
 587         pContact->_Changed( *pObj, SDRUSERCALL_INSERTED, NULL );
 588         // --> OD 2005-03-22 #i45718# - follow-up of #i35635#
 589         // move object to visible layer
 590         pContact->MoveObjToVisibleLayer( pObj );
 591         // <--
 592         // --> OD 2005-05-10 #i45952# - notify that position attributes
 593         // are already set
 594         ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
 595                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
 596         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
 597         {
 598             static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
 599         }
 600         // <--
 601     }
 602     rIter.pMarkList = pMarkLst;
 603 }
 604
 605 void SwUndoDrawDelete::Redo( SwUndoIter &rIter )
 606 {
 607     bDelFmt = TRUE;
 608     SwSpzFrmFmts& rFlyFmts = *rIter.GetDoc().GetSpzFrmFmts();
 609     for( USHORT n = 0; n < pMarkLst->GetMarkCount(); ++n )
 610     {
 611         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 612         SdrObject *pObj = rSave.pObj;
 613         SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 614         SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
 615         //loescht sich selbst!
 616         pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
 617         pObj->SetUserCall( 0 );
 618
 619         // alle Uno-Objecte sollten sich jetzt abmelden
 620         ::lcl_SendRemoveToUno( *pFmt );
 621
 622         rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 623         ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
 624     }
 625 }
 626
 627 void SwUndoDrawDelete::AddObj( USHORT , SwDrawFrmFmt* pFmt,
 628                                 const SdrMark& rMark )
 629 {
 630     SwUndoGroupObjImpl& rSave = *( pObjArr + pMarkLst->GetMarkCount() );
 631     rSave.pObj = rMark.GetMarkedSdrObj();
 632     rSave.pFmt = pFmt;
 633     ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
 634
 635     // alle Uno-Objecte sollten sich jetzt abmelden
 636     ::lcl_SendRemoveToUno( *pFmt );
 637
 638     // aus dem Array austragen
 639     SwDoc* pDoc = pFmt->GetDoc();
 640     SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts();
 641     rFlyFmts.Remove( rFlyFmts.GetPos( pFmt ));
 642
 643     pMarkLst->InsertEntry( rMark );
 644 }
 645