diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-06-01 23:04:00 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-06-04 13:34:56 +0200 |
| commit | 9da9d3054ab14cde2518cf9de8f7d8455800e551 (patch) | |
| tree | a5bccea028ea81d5bb23d1d97214226cb34ed009 /sd | |
| parent | 4927143b6652ce2d19e6f476923112f0ab7fc273 (diff) | |
Use "Radius" instead of "Rad" for new properties
Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322
Tested-by: Jenkins
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index e71a5228c9eb..c6d2f48aedde 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -2855,7 +2855,7 @@ void SdOOXMLExportTest2::testShapeGlowEffect() xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; - xShape->getPropertyValue("GlowEffectRad") >>= nRadius; + xShape->getPropertyValue("GlowEffectRadius") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 Color nColor; xShape->getPropertyValue("GlowEffectColor") >>= nColor; @@ -2919,7 +2919,7 @@ void SdOOXMLExportTest2::testShapeSoftEdgeEffect() xDocShRef = saveAndReload(xDocShRef.get(), PPTX); auto xShapeProps(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; - xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRadius; + xShapeProps->getPropertyValue("SoftEdgeRadius") >>= 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 6711333c866e..a2186fae62af 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1248,7 +1248,7 @@ void SdExportTest::testGlow() // Check glow properties sal_Int32 nGlowEffectRad = 0; - CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRad") >>= nGlowEffectRad); + CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRadius") >>= nGlowEffectRad); CPPUNIT_ASSERT_EQUAL(sal_Int32(529), nGlowEffectRad); // 15 pt = 529.166... mm/100 sal_Int32 nGlowEffectColor = 0; CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectColor") >>= nGlowEffectColor); @@ -1289,7 +1289,7 @@ void SdExportTest::testSoftEdges() // Check property sal_Int32 nRad = 0; - CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRad); + CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdgeRadius") >>= nRad); CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nRad); // 18 pt // Test ODF element diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index d1960223a1b9..bc80fb5e3ca3 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -3111,7 +3111,7 @@ void SdImportTest::testShapeGlowEffectPPTXImpoer() uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; - xShape->getPropertyValue("GlowEffectRad") >>= nRadius; + xShape->getPropertyValue("GlowEffectRadius") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 Color nColor; xShape->getPropertyValue("GlowEffectColor") >>= nColor; |