diff options
author | Armin Le Grand <alg@apache.org> | 2013-01-23 13:27:50 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2013-01-23 13:27:50 +0000 |
commit | b2cc0de3fc9adee90787ca760e86869f9255b380 (patch) | |
tree | 18b91dc019fdc7cfe2c612d9c02d95c9d037e367 /svx/source/svdraw/svdograf.cxx | |
parent | aa85e31b3162cd4b18c818bf0af1a854cb05c57d (diff) |
#121534# Reintegrating changes for rotated bitmap support
Notes
Notes:
merged as: 9bb96049addebd8907854730713d8a3f5f033e34
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index ddecc010385f..2328272834f6 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -737,7 +737,6 @@ void SdrGrafObj::ReleaseGraphicLink() void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bAnim = pGraphic->IsAnimated(); FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 || @@ -745,10 +744,10 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const aGeo.nDrehWink % 27000 == 0; rInfo.bResizePropAllowed = sal_True; - rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim; - rInfo.bRotate90Allowed = bNoPresGrf && !bAnim; - rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim; - rInfo.bMirror45Allowed = bNoPresGrf && !bAnim; + rInfo.bRotateFreeAllowed = bNoPresGrf; + rInfo.bRotate90Allowed = bNoPresGrf; + rInfo.bMirrorFreeAllowed = bNoPresGrf; + rInfo.bMirror45Allowed = bNoPresGrf; rInfo.bMirror90Allowed = !bEmptyPresObj; rInfo.bTransparenceAllowed = sal_False; rInfo.bGradientAllowed = sal_False; |