[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/inc svgio/qa svgio/source

[Xisco Fauli (via logerrit)]

 svgio/inc/svgfecolormatrixnode.hxx              |    1 -
 svgio/qa/cppunit/data/filterFeColorMatrix.svg   |    1 -
 svgio/source/svgreader/svgfecolormatrixnode.cxx |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 870ee9559fa761e8c32f67622c7c3b9796d5f300
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jun 30 12:49:10 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 30 16:23:12 2023 +0200

    tdf#118087: set matrix as default value for type
    
    From https://www.w3.org/TR/SVG11/filters.html#feColorMatrixElement
    "If attribute ‘type’ is not specified, then the effect is as if a value
    of matrix were specified."
    
    Change-Id: I8ddaa9129661d9a9f51c474461cf788d8d524a1e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153804
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 6f091fdf0730e1ed9bee4ba00b6bc2bd7914a80c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153769

diff --git a/svgio/inc/svgfecolormatrixnode.hxx 
b/svgio/inc/svgfecolormatrixnode.hxx
index 78d8b027f653..975d9d082972 100644
--- a/svgio/inc/svgfecolormatrixnode.hxx
+++ b/svgio/inc/svgfecolormatrixnode.hxx
@@ -27,7 +27,6 @@ namespace svgio::svgreader
 {
 enum class ColorType
 {
-    None,
     HueRotate,
     Matrix,
     Saturate,
diff --git a/svgio/qa/cppunit/data/filterFeColorMatrix.svg 
b/svgio/qa/cppunit/data/filterFeColorMatrix.svg
index 07d5559ed1b6..a86c2debc2b0 100644
--- a/svgio/qa/cppunit/data/filterFeColorMatrix.svg
+++ b/svgio/qa/cppunit/data/filterFeColorMatrix.svg
@@ -18,7 +18,6 @@
   <filter id="colorMeGreen">
     <feColorMatrix
       in="SourceGraphic"
-      type="matrix"
       values="0 0 0 0 0
               1 1 1 1 0
               0 0 0 0 0
diff --git a/svgio/source/svgreader/svgfecolormatrixnode.cxx 
b/svgio/source/svgreader/svgfecolormatrixnode.cxx
index 5f8e03c4318b..a36b664da86b 100644
--- a/svgio/source/svgreader/svgfecolormatrixnode.cxx
+++ b/svgio/source/svgreader/svgfecolormatrixnode.cxx
@@ -25,7 +25,7 @@ namespace svgio::svgreader
 {
 SvgFeColorMatrixNode::SvgFeColorMatrixNode(SvgDocument& rDocument, SvgNode* 
pParent)
     : SvgNode(SVGToken::FeColorMatrix, rDocument, pParent)
-    , maType(ColorType::None)
+    , maType(ColorType::Matrix)
 {
 }