diff options
| author | Kai Ahrens <ka@openoffice.org> | 2001-06-18 12:21:10 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2001-06-18 12:21:10 +0000 |
| commit | 53418116eb0fa9fc46f9a974b9d7f267e0df4db8 (patch) | |
| tree | 733b56c9d24da7cfef0a37baacd00669f137160b /svx | |
| parent | 2d1ef8aa2493f044fa543c72b40bd8c8394d8d71 (diff) | |
#75963#: added rotation of metafiles
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index b8d81a53970d..c87c9702e82f 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdograf.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: ka $ $Date: 2001-05-17 15:28:23 $ + * last change: $Author: ka $ $Date: 2001-06-18 13:21:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,7 +333,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const } if( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) && - ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_BITMAP == eType ) && !IsAnimated() ) + ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ) && !IsAnimated() ) { aActAttr.SetRotation( aGeo.nDrehWink / 10 ); } @@ -549,17 +549,17 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { FASTBOOL bTrans = pGraphic->IsTransparent(); FASTBOOL bAnim = pGraphic->IsAnimated(); - FASTBOOL bNoPresBmp = ( pGraphic->GetType() == GRAPHIC_BITMAP ) && !bEmptyPresObj; + FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 || aGeo.nDrehWink % 18000 == 0 || aGeo.nDrehWink % 27000 == 0; rInfo.bResizePropAllowed = TRUE; - rInfo.bRotateFreeAllowed = bNoPresBmp && !bAnim; - rInfo.bRotate90Allowed = bNoPresBmp && !bAnim; - rInfo.bMirrorFreeAllowed = bNoPresBmp && !bAnim; - rInfo.bMirror45Allowed = bNoPresBmp && !bAnim; + rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim; + rInfo.bRotate90Allowed = bNoPresGrf && !bAnim; + rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim; + rInfo.bMirror45Allowed = bNoPresGrf && !bAnim; rInfo.bMirror90Allowed = !bEmptyPresObj; rInfo.bTransparenceAllowed = FALSE; rInfo.bGradientAllowed = FALSE; @@ -942,6 +942,9 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR pOutDev->SetDrawMode( nNewDrawMode |= DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL ); } + if( bRotate && !bRota180 ) + aAttr.SetRotation( nDrehWink / 10 ); + pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr ); pOutDev->SetDrawMode( nOldDrawMode ); } |