diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-04-21 12:00:50 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-06 14:05:41 +0200 |
| commit | 65f3aea4727123a75dbd471592fe711998b5209b (patch) | |
| tree | c4c69d7d1339a4cffc4d7455ea3677a6aa688a49 | |
| parent | b8fb2f0b136e688e76ef8d6f09fd75f61ed4c99f (diff) | |
tdf#101181: implement glow effect also for SdrGrafPrimitive2D
... using the implementation from f9fc420dceb1ece2c98767da16a21aaff771f140
that is already functional for SdrCustomShapePrimitive2D. For now, only for
Draw/Impress.
Change-Id: I4936e8276df2b21cb5c438e89c215b819e9b8a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92636
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 1 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 6 | ||||
| -rw-r--r-- | svx/source/sdr/properties/graphicproperties.cxx | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index d0ceb287d714..ddf07b32f5a2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -549,6 +549,7 @@ <value oor:separator=";"> Calc, Draw, hidden ; DrawImpress, Draw, hidden ; + DrawImpress, Graphic, hidden ; WriterVariants, Draw, hidden ; </value> </prop> diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 77dc73145e33..9f15f4d9fc41 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -125,6 +125,12 @@ namespace drawinglayer::primitive2d aTranslateGrf.getY()); } + if (!aRetval.empty() && !getSdrLFSTAttribute().getGlow().isDefault()) + { + // glow + aRetval = createEmbeddedGlowPrimitive(aRetval, getSdrLFSTAttribute().getGlow()); + } + rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); } diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index ec19696c2d78..35d8e832679a 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -67,6 +67,8 @@ namespace sdr::properties // range from SdrGrafObj SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, + SDRATTR_GLOW_FIRST, SDRATTR_GLOW_LAST, + // range from SdrTextObj EE_ITEMS_START, EE_ITEMS_END>{}); } |