diff options
author | Henry Castro <hcastro@collabora.com> | 2015-04-24 16:55:01 -0400 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-16 14:36:46 +0000 |
commit | 0c02e1892ad87aa81e29b5642b16db3f4c128418 (patch) | |
tree | 05130de189ce7945197f352978789b705a0a15d8 /svx | |
parent | b121efd08e9cc396af25b79c2a4ee55507ff6ee0 (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
(cherry picked from commit b1f1c77687e301c99e81631d33298e44bdb5ca84)
Reviewed-on: https://gerrit.libreoffice.org/16280
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 60910e124b97..a77d9e9e20cf 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3002,6 +3002,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, } // reset object shear and rotations + fObjectRotation = 0.0; aGeo.nRotationAngle = 0; aGeo.RecalcSinCos(); aGeo.nShearAngle = 0; |