external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch

   1 From 473526e1ca3a7117e2daf977e1b82a0a3977fc84 Mon Sep 17 00:00:00 2001
   2 From: Kohei Yoshida <kohei.yoshida@gmail.com>
   3 Date: Wed, 31 Jan 2018 22:24:45 -0500
   4 Subject: [PATCH 2/2] We are supposed to use the foreground color for solid
   5  fill.
   6
   7 (cherry picked from commit f821995022df8dd1e580dd22cf131584b2b1ac4f)
   8 ---
   9  src/liborcus/odf_styles_context.cpp      | 3 ++-
  10  src/liborcus/odf_styles_context_test.cpp | 9 +++++----
  11  2 files changed, 7 insertions(+), 5 deletions(-)
  12
  13 diff --git a/src/liborcus/odf_styles_context.cpp b/src/liborcus/odf_styles_context.cpp
  14 index f9c422a..e5f1cc6 100644
  15 --- a/src/liborcus/odf_styles_context.cpp
  16 +++ b/src/liborcus/odf_styles_context.cpp
  17 @@ -739,7 +739,8 @@ void styles_context::start_element(xmlns_id_t ns, xml_token_t name, const std::v
  18                      {
  19                          spreadsheet::color_elem_t red, green, blue;
  20                          func.get_background_color(red, green, blue);
  21 -                        mp_styles->set_fill_bg_color(255, red, green, blue);
  22 +                        mp_styles->set_fill_pattern_type(ORCUS_ASCII("solid"));
  23 +                        mp_styles->set_fill_fg_color(255, red, green, blue);
  24                      }
  25
  26                      size_t fill_id = mp_styles->commit_fill();
  27 diff --git a/src/liborcus/odf_styles_context_test.cpp b/src/liborcus/odf_styles_context_test.cpp
  28 index 4c7eab5..7255a54 100644
  29 --- a/src/liborcus/odf_styles_context_test.cpp
  30 +++ b/src/liborcus/odf_styles_context_test.cpp
  31 @@ -48,10 +48,11 @@ void test_odf_fill(orcus::spreadsheet::import_styles &styles)
  32      std::cerr << std::hex << (int)fill;
  33      const orcus::spreadsheet::fill_t* cell_fill = styles.get_fill(fill);
  34      assert(cell_fill);
  35 -    std::cerr << std::hex << (int)cell_fill->bg_color.red;
  36 -    assert(cell_fill->bg_color.red == 0xfe);
  37 -    assert(cell_fill->bg_color.green == 0xff);
  38 -    assert(cell_fill->bg_color.blue == 0xcc);
  39 +    std::cerr << std::hex << (int)cell_fill->fg_color.red;
  40 +    assert(cell_fill->fg_color.red == 0xfe);
  41 +    assert(cell_fill->fg_color.green == 0xff);
  42 +    assert(cell_fill->fg_color.blue == 0xcc);
  43 +    assert(cell_fill->pattern_type == "solid");
  44  }
  45
  46  void test_odf_border(orcus::spreadsheet::import_styles &styles)
  47 --
  48 2.7.4
  49