diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-12-28 23:59:41 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-12-30 10:20:54 +0100 |
| commit | 07add037d7845cd31e47efca84b869ca9355eff4 (patch) | |
| tree | 02cfeeb2a1d5670715eee11630358de9c5e84e30 /external/libvisio | |
| parent | 853e13f9146e83b959bc53152ec103470d55fb4f (diff) | |
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.timar@collabora.com>
Diffstat (limited to 'external/libvisio')
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 1 | ||||
| -rw-r--r-- | external/libvisio/tdf-77915-fix-import-of-default-shape-fill-color.patch | 13 |
2 files changed, 14 insertions, 0 deletions
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); + } |