diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 09:37:40 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 09:37:40 +0000 |
commit | 8e0887f0d097c0672f3749b1dee2791600474a29 (patch) | |
tree | c44275446c7417273030a16813c898abb40326d4 | |
parent | b523333527a5270e64cd40d22d40de3f8b1f6430 (diff) |
INTEGRATION: CWS draw23master (1.16.74); FILE MERGED
2004/02/26 14:33:58 af 1.16.74.1: #115429# Include fixes for 110981 into SRC680.
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 17aa2ec2ce20..0e1b5daa5057 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdxcgv.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2003-11-24 17:02:33 $ + * last change: $Author: rt $ $Date: 2004-03-02 10:37:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -642,7 +642,12 @@ Graphic SdrExchangeView::GetObjGraphic( SdrModel* pModel, SdrObject* pObj ) { // try to get a graphic from the object first if( pObj->ISA( SdrGrafObj ) ) - aRet = static_cast< SdrGrafObj* >( pObj )->GetGraphic(); + { + // #110981# Make behaviour coherent with metafile + // recording below (which of course also takes + // view-transformed objects) + aRet = static_cast< SdrGrafObj* >( pObj )->GetTransformedGraphic(); + } else if( pObj->ISA( SdrOle2Obj ) ) { SdrOle2Obj* pOLEObj = static_cast< SdrOle2Obj* >( pObj ); |