diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2021-04-03 13:56:22 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-06 11:42:25 +0200 |
| commit | 7947f3ed80ce2056de4777a21fc6767466645327 (patch) | |
| tree | c1509fcf359ec4c710eb8de339112c9c000162c3 /svx | |
| parent | 4d63b046679539c1e0f5a6f44e87c9420d679f5b (diff) | |
Revert "tdf#141127 Use ODF default values for draw:extrusion-skew"
This reverts commit 2bf8c1e0e211601a70b6b28fdb92f636c7969513.
Reason for revert: tdf#141268 LibreOffice uses -135deg skew angle as internal default. If a user does not touch the direction, the value is not written to file, although that would be necessary because it is not ODF default. With the patch applied the missing value will be interpreted as 45deg on opening. So the first step is, to write -135deg to file. And then after some time, when wrong files are unlikely, the patch can be applied.
A suggestion for writing -135deg is from Julien Nabet in https://gerrit.libreoffice.org/c/core/+/113257. From code it looks good to me, but I have not tested it yet. I would only add some comments to explain the situation.
Change-Id: I71673ad2e5376c2a78fa74900e95117b8543e268
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113538
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
(cherry picked from commit f1b55d3f8e963069fc798bcf559ae9af2bf18b64)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113636
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/qa/unit/customshapes.cxx | 18 | ||||
| -rw-r--r-- | svx/qa/unit/data/tdf141127_defaultSkewAngle.odp | bin | 28191 -> 0 bytes |
2 files changed, 0 insertions, 18 deletions
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx index 036aff90543f..db7808a16f2f 100644 --- a/svx/qa/unit/customshapes.cxx +++ b/svx/qa/unit/customshapes.cxx @@ -933,24 +933,6 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf136176) } } } - -CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf141127WrongSkewDefault) -{ - // Load a document that has a shape in extrusion mode, but no draw:extrusion-skew attribute. - // Error was, that the shape uses the MS Office binary defaults and so the extruded side faces - // were not left/bottom, but top/right. - OUString sURL = m_directories.getURLFromSrc(sDataDirectory) + "tdf141127_defaultSkewAngle.odp"; - mxComponent = loadFromDesktop(sURL, "com.sun.star.comp.presentation.PresentationDocument"); - CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is()); - uno::Reference<drawing::XShape> xShape(getShape(0)); - SdrObjCustomShape& rSdrCustomShape( - static_cast<SdrObjCustomShape&>(*GetSdrObjectFromXShape(xShape))); - - // Check left/bottom of bound rect. Without fix it would be left=15994, bottom=6999. - tools::Rectangle aBoundRect(rSdrCustomShape.GetCurrentBoundRect()); - CPPUNIT_ASSERT_EQUAL(tools::Long(15371), aBoundRect.Left()); - CPPUNIT_ASSERT_EQUAL(tools::Long(7622), aBoundRect.Bottom()); -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/qa/unit/data/tdf141127_defaultSkewAngle.odp b/svx/qa/unit/data/tdf141127_defaultSkewAngle.odp Binary files differdeleted file mode 100644 index 5cd0da96ec20..000000000000 --- a/svx/qa/unit/data/tdf141127_defaultSkewAngle.odp +++ /dev/null |