diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 08:48:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 08:48:09 +0000 |
| commit | 178f0566e6e60bd8f94f02d092cea3e721055276 (patch) | |
| tree | 5576f9a450159976144efaa51a9203ed9fcefc2e /svx/source/svdraw/svdogrp.cxx | |
| parent | 4dc2a3a19e8bdcfdc8b6970d5b709fdb809b6963 (diff) | |
INTEGRATION: CWS aw020 (1.23.38); FILE MERGED
2004/11/04 16:03:55 aw 1.23.38.1: #i36406#
Diffstat (limited to 'svx/source/svdraw/svdogrp.cxx')
| -rw-r--r-- | svx/source/svdraw/svdogrp.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index ad1921ab922e..b05feb1a883d 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdogrp.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 10:59:55 $ + * last change: $Author: obo $ $Date: 2004-11-17 09:48:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -906,9 +906,19 @@ SdrObject* SdrObjGroup::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte void SdrObjGroup::operator=(const SdrObject& rObj) { - if (rObj.IsGroupObject()) { + if(rObj.IsGroupObject()) + { + // copy SdrObject stuff SdrObject::operator=(rObj); + + // #i36404# + // copy SubList, init model and page first + SdrObjList& rSourceSubList = *rObj.GetSubList(); + pSub->SetPage(rSourceSubList.GetPage()); + pSub->SetModel(rSourceSubList.GetModel()); pSub->CopyObjects(*rObj.GetSubList()); + + // copy local paremeters nDrehWink =((SdrObjGroup&)rObj).nDrehWink; nShearWink =((SdrObjGroup&)rObj).nShearWink; aName =((SdrObjGroup&)rObj).aName; |