Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 50 insertions, 0 deletions

diff --git a/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
new file mode 100644
index 000000000..6adae9ba2
--- /dev/null
+++ b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
@@ -0,0 +1,50 @@
+From 98d2b3377da71b713a37f9004acff3c02c22ce2b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Wed, 31 Jan 2018 22:11:25 -0500
+Subject: [PATCH 1/2] Alpha value of 0 means fully transparent. I'm sure 255
+ was intended.
+
+(cherry picked from commit f7953a814d6a43205791b6cc01c528ef5d4b1ce3)
+---
+ src/liborcus/gnumeric_sheet_context.cpp | 4 ++--
+ src/liborcus/odf_styles_context.cpp     | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/liborcus/gnumeric_sheet_context.cpp b/src/liborcus/gnumeric_sheet_context.cpp
+index 8659cc3..6bd1471 100644
+--- a/src/liborcus/gnumeric_sheet_context.cpp
++++ b/src/liborcus/gnumeric_sheet_context.cpp
+@@ -132,7 +132,7 @@ public:
+             {
+                 spreadsheet::color_elem_t red, green, blue;
+                 gnumeric_helper::parse_RGB_color_attribute(red, green, blue, attr.value);
+-                m_styles.set_fill_fg_color(0, red, green, blue);
++                m_styles.set_fill_fg_color(255, red, green, blue);
+ 
+                 m_fill = true;
+ 
+@@ -145,7 +145,7 @@ public:
+             {
+                 spreadsheet::color_elem_t red, green, blue;
+                 gnumeric_helper::parse_RGB_color_attribute(red, green, blue, attr.value);
+-                m_styles.set_fill_bg_color(0, red, green, blue);
++                m_styles.set_fill_bg_color(255, red, green, blue);
+ 
+                 m_fill = true;
+             }
+diff --git a/src/liborcus/odf_styles_context.cpp b/src/liborcus/odf_styles_context.cpp
+index d988f7d..f9c422a 100644
+--- a/src/liborcus/odf_styles_context.cpp
++++ b/src/liborcus/odf_styles_context.cpp
+@@ -739,7 +739,7 @@ void styles_context::start_element(xmlns_id_t ns, xml_token_t name, const std::v
+                     {
+                         spreadsheet::color_elem_t red, green, blue;
+                         func.get_background_color(red, green, blue);
+-                        mp_styles->set_fill_bg_color(0, red, green, blue);
++                        mp_styles->set_fill_bg_color(255, red, green, blue);
+                     }
+ 
+                     size_t fill_id = mp_styles->commit_fill();
+-- 
+2.7.4
+