diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:32:32 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:32:32 +0000 |
commit | d90dd20d93ae03646064fe8f647b7fb528248a19 (patch) | |
tree | a30194c6fbc09ce511096c69a9b95a06177d089b /sd/source/ui/func | |
parent | 924859b849b8669a61ecb62ce27cd02daf4499b5 (diff) |
INTEGRATION: CWS aw035 (1.9.26); FILE MERGED
2006/07/13 16:05:13 aw 1.9.26.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r-- | sd/source/ui/func/fucopy.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 4880144802ba..1258533504c4 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fucopy.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:32:18 $ + * last change: $Author: rt $ $Date: 2006-07-25 11:32:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -277,7 +277,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // set protection flags at marked copies to null for( j = 0; j < nCopyMarkCount; j++ ) { - pObj = aCopyMarkList.GetMark( j )->GetObj(); + pObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); if( pObj ) { @@ -303,8 +303,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { for( j = 0; j < nMarkCount; j++ ) { - SdrObject* pSrcObj = aMarkList.GetMark( j )->GetObj(); - SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetObj(); + SdrObject* pSrcObj = aMarkList.GetMark( j )->GetMarkedSdrObj(); + SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); if( pSrcObj && pDstObj && ( pSrcObj->GetObjInventor() == pDstObj->GetObjInventor() ) && |