oox/source/drawingml/effectproperties.hxx | 93 ------------------------------ solenv/clang-format/excludelist | 1 2 files changed, 94 deletions(-)
New commits: commit 09418010d57c500470fae63b5b6a18a498d5fd70 Author: Simon Chenery <[email protected]> AuthorDate: Tue Jan 27 22:28:56 2026 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Wed Jan 28 18:36:46 2026 +0100 Remove unused duplicate file oox/source/drawingml/effectproperties.hxx File include/oox/drawingml/effectproperties.hxx is now used in LO compilation since commit 3eac847927a0cdfa40c3fea38c473ed2ad7faecc and is identical to oox/source/drawingml/effectproperties.hxx, except for formatting and whitespace differences. Change-Id: Iba6c7233f07ff40f3d05ef8d6516d03dabc330b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198232 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx deleted file mode 100644 index 992e2bddf3ef..000000000000 --- a/oox/source/drawingml/effectproperties.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- 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/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 29e4a3137818..1e1693126cd0 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6843,7 +6843,6 @@ oox/source/drawingml/diagram/layoutnodecontext.cxx oox/source/drawingml/diagram/layoutnodecontext.hxx oox/source/drawingml/drawingmltypes.cxx oox/source/drawingml/effectproperties.cxx -oox/source/drawingml/effectproperties.hxx oox/source/drawingml/effectpropertiescontext.cxx oox/source/drawingml/fillproperties.cxx oox/source/drawingml/graphicshapecontext.cxx
