mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix position correction for flipped shapes

Browse Source 
This complements change a9fc145671
The Translation-compensation of that fix didn't work for flipped shapes.
Also, vertically flipped shapes made problems.
Also 360 °C = 0°C (drawingml.hxx)
I didn't dare to fix it earlier because there is some problem with the selection frames.
But that is an import bug, not caused by some export stuff!
This import bug makes the manipulation rectangles around the shapes flipped & turning in the wrong direction, perhaps due to
CroftCro$oft clockwisification!

Change-Id: I05aa036d31cd5d9a8b194897b3d92ec12d6d2c61
Signed-off-by: Lennard <Wasserthal@nefkom.net>
Reviewed-on: https://gerrit.libreoffice.org/1250
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
This commit is contained in:
Lennard
2012-12-05 21:28:02 +01:00
committed by Petr Mladek
parent e8e263de89
commit 454cd82012
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/inc/oox/export/drawingml.hxx
View File

@@ -28,7 +28,7 @@
#include <tools/poly.hxx>
#include <filter/msfilter/escherex.hxx>
#ifndef PPTX_EXPORT_ROTATE_CLOCKWISIFY
#define PPTX_EXPORT_ROTATE_CLOCKWISIFY(input) (21600000-input*600)
#define PPTX_EXPORT_ROTATE_CLOCKWISIFY(input) ((21600000-input*600)%21600000)
#endif
class Graphic;

10
oox/source/export/drawingml.cxx
View File

@@ -643,8 +643,14 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32
{
SdrObject* pShape = (SdrObject*) GetSdrObjectFromXShape( rXShape );
nRotation=pShape->GetRotateAngle();
aPos.X-=(1-cos(nRotation*F_PI18000))*aSize.Width/2-sin(nRotation*F_PI18000)*aSize.Height/2;
aPos.Y-=(1-cos(nRotation*F_PI18000))*aSize.Height/2+sin(nRotation*F_PI18000)*aSize.Width/2;
int faccos=bFlipV ? -1 : 1;
int facsin=bFlipH ? -1 : 1;
aPos.X-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Width/2-facsin*sin(nRotation*F_PI18000)*aSize.Height/2;
aPos.Y-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Height/2+facsin*sin(nRotation*F_PI18000)*aSize.Width/2;
}
if (!bSuppressRotation)
{
if (bFlipV) {nRotation=(nRotation+18000)%36000;}
}
WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, PPTX_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
}