strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw035 (1.9.26); FILE MERGED

Browse source 
2006/07/13 16:05:13 aw 1.9.26.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
This commit is contained in:
Rüdiger Timm 2006-07-25 10:32:32 +00:00
parent 924859b849
commit d90dd20d93
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/ui/func/fucopy.cxx
View file

@ -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() ) &&