diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:39:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:39:17 +0000 |
| commit | 8382910d20ba52b32b5d996d5bf55eec3a255a88 (patch) | |
| tree | 57175c366bb93550e61adae2f019aa9ca40f899f /sc/source/ui/view/viewfun7.cxx | |
| parent | 12b983b8cace4c54fc0b86b1f92a1d38a74d3f8f (diff) | |
INTEGRATION: CWS aw009 (1.13.98); FILE MERGED
2004/04/26 10:51:15 aw 1.13.98.1: #116168#, #116235#
Diffstat (limited to 'sc/source/ui/view/viewfun7.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun7.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index ae7e5d208e44..dc4934720ad0 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun7.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:08:03 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:39:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,9 +189,16 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, for (ULONG nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=aMark.GetMark(nm); const SdrObject* pObj=pM->GetObj(); - SdrObject* pNeuObj=pObj->Clone(pDestPage,pModel); + + // #116235# + SdrObject* pNeuObj=pObj->Clone(); + //SdrObject* pNeuObj=pObj->Clone(pDestPage,pModel); + if (pNeuObj!=NULL) { + pNeuObj->SetModel(pModel); + pNeuObj->SetPage(pDestPage); + // #68787# copy graphics within the same model - always needs new name if ( pNeuObj->ISA(SdrGrafObj) && !bPasteIsMove ) pNeuObj->SetName(((ScDrawLayer*)pModel)->GetNewGraphicName()); |