From 58f05f796676734b31d1a3d604064553f61b73b3 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Mon, 12 Jul 2004 14:01:25 +0000
Subject: INTEGRATION: CWS aw013 (1.5.36); FILE MERGED 2004/06/24 09:33:09 aw
 1.5.36.1: #i29181#

---
 sd/source/ui/func/fucopy.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sd/source/ui/func/fucopy.cxx')

diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index a6f8a06edc29..70e9ba441cac 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fucopy.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: hr $ $Date: 2004-05-10 15:46:31 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:01:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,10 +130,10 @@ FuCopy::FuCopy (
     SfxRequest& rReq)
     : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
 {
-    if( pView->HasMarkedObj() )
+    if( pView->AreObjectsMarked() )
     {
         // Undo
-        String aString( pView->GetMarkDescription() );
+        String aString( pView->GetDescriptionOfMarkedObjects() );
         aString.Append( sal_Unicode(' ') );
         aString.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) );
         pView->BegUndo( aString );
@@ -247,7 +247,7 @@ FuCopy::FuCopy (
             bWaiting = TRUE;
         }
 
-        const SdrMarkList   aMarkList( pView->GetMarkList() );
+        const SdrMarkList   aMarkList( pView->GetMarkedObjectList() );
         const ULONG         nMarkCount = aMarkList.GetMarkCount();
         SdrPageView*        pPageView = pView->GetPageViewPvNum( 0 );
         SdrObject*          pObj = NULL;
@@ -286,7 +286,7 @@ FuCopy::FuCopy (
             pView->CopyMarked();
 
             // get newly selected objects
-            SdrMarkList aCopyMarkList( pView->GetMarkList() );
+            SdrMarkList aCopyMarkList( pView->GetMarkedObjectList() );
             ULONG       j, nCopyMarkCount = aMarkList.GetMarkCount();
 
             // set protection flags at marked copies to null
-- 
cgit