[Libreoffice-commits] core.git: svx/qa xmloff/source

[Regina Henschel (via logerrit)]

 dev/null                               |binary
 svx/qa/unit/customshapes.cxx           |   18 ------------------
 xmloff/source/draw/ximpcustomshape.cxx |    9 ---------
 3 files changed, 27 deletions(-)

New commits:
commit f1b55d3f8e963069fc798bcf559ae9af2bf18b64
Author:     Regina Henschel <rb.henschel at t-online.de>
AuthorDate: Sat Apr 3 13:56:22 2021 +0200
Commit:     Regina Henschel <rb.henschel at t-online.de>
CommitDate: Sat Apr 3 18:15:12 2021 +0200

    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 at t-online.de>

diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 811b4489569c..4e3f76db74ec 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -940,24 +940,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
deleted file mode 100644
index 5cd0da96ec20..000000000000
Binary files a/svx/qa/unit/data/tdf141127_defaultSkewAngle.odp and /dev/null differ
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 15d296187348..ebaf15651950 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1286,15 +1286,6 @@ void XMLEnhancedCustomShapeContext::endFastElement(sal_Int32 )
         }
     }
 
-    //tdf#141127 Add ODF default values. Otherwise defaults from MS Office binary format are used.
-    if (!maExtrusion.empty())
-    {
-        auto it = std::find_if(maExtrusion.begin(), maExtrusion.end(), 
-            [](css::beans::PropertyValue& rProp){return EASGet(rProp.Name) == EAS_Skew;} );
-        if (it == maExtrusion.end())
-            GetEnhancedParameterPair(maExtrusion, "50 45", EAS_Skew);
-    }
-
     SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maExtrusion, EASGet( EAS_Extrusion ) );
     SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maPath,      EASGet( EAS_Path ) );
     SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maTextPath,  EASGet( EAS_TextPath ) );