diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:29:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:29:25 +0000 |
| commit | 925a70b94e56b90643d5ae0bbcb3b09d6f9b7f0a (patch) | |
| tree | 9a2a70f9187186c83fb3ac95c94fd444475a0999 /svx | |
| parent | 8a3cdfe70f978960d5bebde2ac9a207238df518e (diff) | |
INTEGRATION: CWS aw009 (1.16.196); FILE MERGED
2004/04/22 12:36:31 aw 1.16.196.1: #116235#
Removed Clone(...) command with 2 parameters, removed some involved problems
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/engine3d/view3d.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index d19825b87c2e..82d4f92b94dd 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view3d.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2003-11-24 16:38:23 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:29:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -597,9 +597,17 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs if(pObj && pObj->ISA(E3dCompoundObject)) { // Kopieren - E3dObject* pNew = (E3dObject*)pObj->Clone(pDstScene->GetPage(), pDstScene->GetModel()); + // E3dObject* pNew = (E3dObject*)pObj->Clone(pDstScene->GetPage(), pDstScene->GetModel()); + + // #116235# + E3dObject* pNew = (E3dObject*)pObj->Clone(); + if(pNew) { + // #116235# + pNew->SetModel(pDstScene->GetModel()); + pNew->SetPage(pDstScene->GetPage()); + // Neues Objekt in Szene einfuegen pNew->NbcSetLayer(pObj->GetLayer()); pNew->NbcSetStyleSheet(pObj->GetStyleSheet(), sal_True); |