[Libreoffice-commits] core.git: svx/inc svx/source
Mike Kaganski (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 11 16:23:58 UTC 2020
svx/inc/sdr/primitive2d/sdrattributecreator.hxx | 3 --
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 30 ++++++++++-----------
2 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit 14514042f7c908d08c3284135cc6de8da387c118
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon May 11 17:35:52 2020 +0300
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon May 11 18:23:14 2020 +0200
Limit utility function's visibility
Change-Id: I1d1a89a197d90dcb1e7de9b4090e1fe6baf53e1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93972
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
index 10d105fd1c45..9cff4afd6770 100644
--- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
@@ -68,9 +68,6 @@ namespace drawinglayer
attribute::SdrFillAttribute SVXCORE_DLLPUBLIC createNewSdrFillAttribute(
const SfxItemSet& rSet);
- attribute::SdrGlowAttribute createNewSdrGlowAttribute(
- const SfxItemSet& rSet);
-
// #i101508# Support handing over given text-to-border distances
attribute::SdrTextAttribute createNewSdrTextAttribute(
const SfxItemSet& rSet,
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index bb43198bf4f6..0e8dec828bf6 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -212,6 +212,21 @@ namespace drawinglayer
return aRetval;
}
+
+ attribute::SdrGlowAttribute createNewSdrGlowAttribute(const SfxItemSet& rSet)
+ {
+ const bool bGlow(rSet.Get(SDRATTR_GLOW).GetValue());
+ if (!bGlow)
+ return attribute::SdrGlowAttribute();
+ sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue();
+ Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue());
+ sal_uInt16 nTransparency(rSet.Get(SDRATTR_GLOW_TRANSPARENCY).GetValue());
+ if (nTransparency)
+ aColor.SetTransparency(std::round(nTransparency / 100.0 * 255.0));
+
+ attribute::SdrGlowAttribute glowAttr{ nRadius, aColor };
+ return glowAttr;
+ }
} // end of anonymous namespace
} // end of namespace drawinglayer
@@ -335,21 +350,6 @@ namespace drawinglayer::primitive2d
return attribute::SdrLineStartEndAttribute();
}
- attribute::SdrGlowAttribute createNewSdrGlowAttribute( const SfxItemSet& rSet)
- {
- const bool bGlow(rSet.Get(SDRATTR_GLOW).GetValue());
- if(!bGlow)
- return attribute::SdrGlowAttribute();
- sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue();
- Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue());
- sal_uInt16 nTransparency(rSet.Get(SDRATTR_GLOW_TRANSPARENCY).GetValue());
- if (nTransparency)
- aColor.SetTransparency(std::round(nTransparency / 100.0 * 255.0));
-
- attribute::SdrGlowAttribute glowAttr{ nRadius, aColor };
- return glowAttr;
- }
-
attribute::SdrShadowAttribute createNewSdrShadowAttribute(const SfxItemSet& rSet)
{
const bool bShadow(rSet.Get(SDRATTR_SHADOW).GetValue());
More information about the Libreoffice-commits
mailing list