core.git: Branch 'libreoffice-24-2' - external/libvisio

[Andras Timar (via logerrit)]

 external/libvisio/UnpackedTarball_libvisio.mk                            |    
1 
 external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch |   
13 ++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit dedcfc8d8935ce9d733c3551b7add1af2b7d730d
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Dec 28 23:59:41 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 3 10:33:25 2024 +0100

    tdf#77915 fix import of default shape fill color
    
    Change-Id: Ibbb1ec508dcd87512b4f4b6da8729255c7ed9fb0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161396
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 07add037d7845cd31e47efca84b869ca9355eff4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161428
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index e19878740289..85e356db8837 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,6 +17,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libvisio))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
     external/libvisio/ubsan.patch \
+    external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch 
b/external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch
new file mode 100644
index 000000000000..68c0c2c88b10
--- /dev/null
+++ b/external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch
@@ -0,0 +1,13 @@
+--- src/lib/VSDStyles.h
++++ src/lib/VSDStyles.h
+@@ -129,7 +129,9 @@ struct VSDOptionalFillStyle
+     ASSIGN_OPTIONAL(style.qsFillColour, qsFillColour);
+     ASSIGN_OPTIONAL(style.qsShadowColour, qsShadowColour);
+     ASSIGN_OPTIONAL(style.qsFillMatrix, qsFillMatrix);
+-    ASSIGN_OPTIONAL(style.fgColour, fgColour);
++    // Colour 'Blue, Variant 1' is special. It is the default,
++    // and it is not saved explicitely in the VSDX file.
++    ASSIGN_OPTIONAL(style.fgColour, fgColour);else fgColour = Colour(0x5b, 
0x9b, 0xd5, 0);
+     ASSIGN_OPTIONAL(style.bgColour, bgColour);
+     ASSIGN_OPTIONAL(style.shadowFgColour, shadowFgColour);
+   }