diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-11 17:26:22 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-11 18:24:23 +0200 |
| commit | d8d31f74236e87ea878f7fac5538e707df5b13ca (patch) | |
| tree | 539caa213012a0c2b3f22d528eeeb4c64803e2e0 /sd | |
| parent | 14514042f7c908d08c3284135cc6de8da387c118 (diff) | |
tdf#49247: no need in extra boolean property, radius is enough
When soft edge has radius 0, the effect is disabled.
Change-Id: I7d66ea7b87e0ed59129a83885d52906b8edf75f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93971
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 3 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 72e1110fe693..378189e15fa3 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -2923,9 +2923,6 @@ void SdOOXMLExportTest2::testShapeSoftEdgeEffect() = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-soft-edges.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); auto xShapeProps(getShapeFromPage(0, 0, xDocShRef)); - bool bHasSoftEdges = false; - xShapeProps->getPropertyValue("SoftEdge") >>= bHasSoftEdges; - CPPUNIT_ASSERT(bHasSoftEdges); sal_Int32 nRadius = -1; xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nRadius); // 18 pt diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index eeac217a3b83..4bdced5fe6fa 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1316,10 +1316,7 @@ void SdExportTest::testSoftEdges() xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile); auto xShapeProps(getShapeFromPage(0, 0, xDocShRef)); - // Check glow properties - bool bEffect = false; - CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdge") >>= bEffect); - CPPUNIT_ASSERT(bEffect); + // Check property sal_Int32 nRad = 0; CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRad); CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nRad); // 18 pt @@ -1330,11 +1327,7 @@ void SdExportTest::testSoftEdges() // check that we actually test graphic style assertXPath(pXmlDoc, "/office:document-content/office:automatic-styles/style:style[2]", "family", "graphic"); - // check loext graphic attributes - assertXPath( - pXmlDoc, - "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", - "softedge", "visible"); + // check loext graphic attribute assertXPath( pXmlDoc, "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", |