From 3eac847927a0cdfa40c3fea38c473ed2ad7faecc Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Wed, 21 Aug 2024 17:34:23 +0200 Subject: tdf#161826 - Add uniform Glow effect for texts in shapes - Add new text Glow effect properties for shapes - Using TextGlowPrimitive for rendering uniform text glow in shapes - Add/allow new UI Glow Effect for texts in shapes on sidebar (Only for Impress/Draw and Calc) - Import/Export ooxml files with Glow effect on texts in shapes (Only PPTX/XLSX) - Import/Export odf files with Glow effect on texts in shapes - Add unit test for glow text attributes in ODF - Add uni tests for OOXML import/export Note: Also this patch effects on tdf#144061 - Effects: Allow GLOW to apply to Text (as we have for shapes) Change-Id: I16586c01654f197f532129e4e06aa2ef9f214395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172216 Reviewed-by: Balazs Varga Tested-by: Jenkins Reviewed-by: Regina Henschel --- include/oox/drawingml/effectproperties.hxx | 89 ++++++++++++++++++++++++++++++ include/oox/export/drawingml.hxx | 1 + 2 files changed, 90 insertions(+) create mode 100644 include/oox/drawingml/effectproperties.hxx (limited to 'include/oox') diff --git a/include/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx new file mode 100644 index 000000000000..71b05af78752 --- /dev/null +++ b/include/oox/drawingml/effectproperties.hxx @@ -0,0 +1,89 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX +#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX + +#include +#include + +#include +#include +#include + +namespace model +{ +enum class RectangleAlignment; +} + +namespace oox::drawingml +{ +struct EffectGlowProperties +{ + std::optional moGlowRad; // size of glow effect + Color moGlowColor; + // TODO saturation and luminance missing + + void assignUsed(const EffectGlowProperties& rSourceProps); +}; + +struct EffectSoftEdgeProperties +{ + std::optional moRad; // size of effect + + void assignUsed(const EffectSoftEdgeProperties& rSourceProps); +}; + +struct EffectShadowProperties +{ + std::optional moShadowDist; + std::optional moShadowDir; + std::optional moShadowSx; + std::optional moShadowSy; + Color moShadowColor; + std::optional moShadowBlur; // size of blur effect + std::optional moShadowAlignment; + + /** Overwrites all members that are explicitly set in rSourceProps. */ + void assignUsed(const EffectShadowProperties& rSourceProps); +}; + +struct Effect +{ + OUString msName; + std::map maAttribs; + Color moColor; + + css::beans::PropertyValue getEffect(); +}; + +struct EffectProperties +{ + EffectShadowProperties maShadow; + EffectGlowProperties maGlow; + EffectSoftEdgeProperties maSoftEdge; + + /** Stores all effect properties, including those not supported by core yet */ + std::vector> m_Effects; + + EffectProperties() {} + EffectProperties(EffectProperties const& rOther) { assignUsed(rOther); } + + /** Overwrites all members that are explicitly set in rSourceProps. */ + void assignUsed(const EffectProperties& rSourceProps); + + /** Writes the properties to the passed property map. */ + void pushToPropMap(PropertyMap& rPropMap, const GraphicHelper& rGraphicHelper) const; +}; + +} // namespace oox::drawingml + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 864aaebbb61c..14df9e9cad8c 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -339,6 +339,7 @@ protected: bool IsFontworkShape(const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet); void WriteGlowEffect(const css::uno::Reference& rXPropSet); + void WriteTextGlowEffect(const css::uno::Reference& rXPropSet); void WriteSoftEdgeEffect(const css::uno::Reference& rXPropSet); void WriteCustomGeometryPoint(const css::drawing::EnhancedCustomShapeParameterPair& rParamPair, const EnhancedCustomShape2d& rCustomShape2d, -- cgit