diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-23 19:54:14 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-24 07:25:07 +0200 |
commit | ebd391767d70903e6a4ea7e213f475af94e183ec (patch) | |
tree | 45528ea8619cf1a6786f8158f8f8d957a1c00223 /sd | |
parent | 0e5e935deb0527c64865cfcc53a0421e56b74b6f (diff) |
tdf#101181: drop useless "GlowEffect" boolean property
Just use GlowEffectRad to indicate effect presense: radius of 0 means
effect is disabled.
Change-Id: Ic06bba34f5a851f120d3d00cb7e20c429ead9ee1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94732
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 | 7 | ||||
-rw-r--r-- | sd/qa/unit/import-tests.cxx | 3 | ||||
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 1 |
6 files changed, 0 insertions, 20 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 69ee1650d780..e71a5228c9eb 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -2854,9 +2854,6 @@ void SdOOXMLExportTest2::testShapeGlowEffect() ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); - bool bHasGlow = false; - xShape->getPropertyValue("GlowEffect") >>= bHasGlow; - CPPUNIT_ASSERT(bHasGlow); sal_Int32 nRadius = -1; xShape->getPropertyValue("GlowEffectRad") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index f1d99e2c840a..6711333c866e 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1247,9 +1247,6 @@ void SdExportTest::testGlow() uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); // Check glow properties - bool bGlowEffect = false; - CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffect") >>= bGlowEffect); - CPPUNIT_ASSERT(bGlowEffect); sal_Int32 nGlowEffectRad = 0; CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRad") >>= nGlowEffectRad); CPPUNIT_ASSERT_EQUAL(sal_Int32(529), nGlowEffectRad); // 15 pt = 529.166... mm/100 @@ -1270,10 +1267,6 @@ void SdExportTest::testGlow() assertXPath( pXmlDoc, "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", - "glow", "visible"); - assertXPath( - pXmlDoc, - "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", "glow-radius", "0.529cm"); assertXPath( pXmlDoc, diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 32e0d68f8dbe..d1960223a1b9 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -3110,9 +3110,6 @@ void SdImportTest::testShapeGlowEffectPPTXImpoer() = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); - bool bHasGlow = false; - xShape->getPropertyValue("GlowEffect") >>= bHasGlow; - CPPUNIT_ASSERT(bHasGlow); sal_Int32 nRadius = -1; xShape->getPropertyValue("GlowEffectRad") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 0f155bee6b8c..4bb8199bc49f 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2860,11 +2860,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_ATTR_GLOW - [ - ExecMethod = FuTemporary ; - StateMethod = GetAttrState ; - ] SID_ATTR_GLOW_COLOR [ ExecMethod = FuTemporary ; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9fbd603f69ac..58cd5e5297b2 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3470,7 +3470,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_ATTR_GLOW: case SID_ATTR_GLOW_COLOR: case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index f506119ad607..bcaea408d937 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -437,7 +437,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_KERNING: case SID_ATTR_CHAR_CASEMAP: - case SID_ATTR_GLOW: case SID_ATTR_GLOW_COLOR: case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: |