summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga.extern@allotropia.de>2024-08-21 17:34:23 +0200
committerBalazs Varga <balazs.varga.extern@allotropia.de>2024-08-29 19:59:24 +0200
commit3eac847927a0cdfa40c3fea38c473ed2ad7faecc (patch)
treed1e26675fb6aca7d8751426c010b0b9e33d5c7e3 /include/oox
parent786aed3a35a50c0e147e15d29c88987aaf523775 (diff)
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 <balazs.varga.extern@allotropia.de> Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/drawingml/effectproperties.hxx89
-rw-r--r--include/oox/export/drawingml.hxx1
2 files changed, 90 insertions, 0 deletions
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 <oox/drawingml/color.hxx>
+#include <oox/helper/propertymap.hxx>
+
+#include <memory>
+#include <vector>
+#include <map>
+
+namespace model
+{
+enum class RectangleAlignment;
+}
+
+namespace oox::drawingml
+{
+struct EffectGlowProperties
+{
+ std::optional<sal_Int64> moGlowRad; // size of glow effect
+ Color moGlowColor;
+ // TODO saturation and luminance missing
+
+ void assignUsed(const EffectGlowProperties& rSourceProps);
+};
+
+struct EffectSoftEdgeProperties
+{
+ std::optional<sal_Int64> moRad; // size of effect
+
+ void assignUsed(const EffectSoftEdgeProperties& rSourceProps);
+};
+
+struct EffectShadowProperties
+{
+ std::optional<sal_Int64> moShadowDist;
+ std::optional<sal_Int64> moShadowDir;
+ std::optional<sal_Int64> moShadowSx;
+ std::optional<sal_Int64> moShadowSy;
+ Color moShadowColor;
+ std::optional<sal_Int64> moShadowBlur; // size of blur effect
+ std::optional<model::RectangleAlignment> moShadowAlignment;
+
+ /** Overwrites all members that are explicitly set in rSourceProps. */
+ void assignUsed(const EffectShadowProperties& rSourceProps);
+};
+
+struct Effect
+{
+ OUString msName;
+ std::map<OUString, css::uno::Any> 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<std::unique_ptr<Effect>> 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<css::beans::XPropertySet>& rXPropSet);
+ void WriteTextGlowEffect(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet);
void WriteSoftEdgeEffect(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet);
void WriteCustomGeometryPoint(const css::drawing::EnhancedCustomShapeParameterPair& rParamPair,
const EnhancedCustomShape2d& rCustomShape2d,