summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2015-04-24 16:55:01 -0400
committerAndras Timar <andras.timar@collabora.com>2015-05-28 09:04:25 +0200
commitdabe4ad3bf21b6b6c9eadbd7e78262a1f59af771 (patch)
tree653f2b13cc8188b0934e83b4c3ac104f9cb4db1d /svx
parentcf851cda7c943548d0ce60d0b4836ccbf6e76698 (diff)
Resolves tdf#67712 form controls and draw objects
anchored to cell but changes position after reopening Also included tdf#68797 "FILEOPEN lost position of lines anchored to cell". It was marked as duplicate but the step to reproduce are different. Conflicts: sc/qa/unit/subsequent_filters-test.cxx Conflicts: sc/qa/unit/subsequent_export-test.cxx Reviewed-on: https://gerrit.libreoffice.org/15523 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 487880b6882ec01c1b4679eae60bec484272a86b) Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdoashp.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 4ea4c4de24c5..00cff5f53741 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3003,6 +3003,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
}
// reset object shear and rotations
+ fObjectRotation = 0.0;
aGeo.nRotationAngle = 0;
aGeo.RecalcSinCos();
aGeo.nShearAngle = 0;