From 0efb3d2f9712cc52e84e79e665c9d49663d4b3ae Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Mon, 26 Oct 2015 23:06:00 -0400
Subject: [PATCH] fix worksheet reordering on save

---
 build/cmake/build-osx.sh        |   2 +-
 build/cmake/xlnt/CMakeLists.txt |   2 +-
 include/xlnt/styles/fill.hpp    |  59 ++++++++++++++++++++++++++++++++
 samples/sample1.xlsx            | Bin 491964 -> 495074 bytes
 source/reader/style_reader.cpp  |  16 +++++++++
 source/workbook/workbook.cpp    |  10 +++++-
 source/writer/excel_writer.cpp  |  17 ++++++---
 source/writer/style_writer.cpp  |   2 ++
 8 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/build/cmake/build-osx.sh b/build/cmake/build-osx.sh
index 57fabcae..c1c565c4 100755
--- a/build/cmake/build-osx.sh
+++ b/build/cmake/build-osx.sh
@@ -7,5 +7,5 @@ fi
 
 mkdir build
 cd build
-cmake ..
+cmake -G "Unix Makefiles" ..
 make
diff --git a/build/cmake/xlnt/CMakeLists.txt b/build/cmake/xlnt/CMakeLists.txt
index 5284a473..2a72bd28 100644
--- a/build/cmake/xlnt/CMakeLists.txt
+++ b/build/cmake/xlnt/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../../source)
 include_directories(../../../third-party/miniz)
 include_directories(../../../third-party/pugixml/src)
 
-FILE(GLOB SOURCES ../../../source/*/*.cpp)
+FILE(GLOB SOURCES ../../../source/*/* ../../../include/xlnt/*/*.hpp ../../../include/xlnt/*.hpp)
 FILE(GLOB DETAIL_SOURCES ../../../source/detail/*.cpp)
 
 add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)
diff --git a/include/xlnt/styles/fill.hpp b/include/xlnt/styles/fill.hpp
index cfde640a..831c6f38 100644
--- a/include/xlnt/styles/fill.hpp
+++ b/include/xlnt/styles/fill.hpp
@@ -201,6 +201,65 @@ public:
         if(type_ == type::pattern)
         {
             hash_combine(seed, static_cast<std::size_t>(pattern_type_));
+            hash_combine(seed, foreground_color_assigned_);
+            
+            if(foreground_color_assigned_)
+            {
+                hash_combine(seed, static_cast<std::size_t>(foreground_color_.get_type()));
+                
+                switch(foreground_color_.get_type())
+                {
+                case color::type::auto_:
+                    hash_combine(seed, static_cast<std::size_t>(foreground_color_.get_auto()));
+                    break;
+                case color::type::indexed:
+                    hash_combine(seed, static_cast<std::size_t>(foreground_color_.get_index()));
+                    break;
+                case color::type::theme:
+                    hash_combine(seed, static_cast<std::size_t>(foreground_color_.get_theme()));
+                    break;
+                }
+            }
+            
+            hash_combine(seed, background_color_assigned_);
+            
+            if(background_color_assigned_)
+            {
+                hash_combine(seed, static_cast<std::size_t>(background_color_.get_type()));
+                
+                switch(foreground_color_.get_type())
+                {
+                    case color::type::auto_:
+                        hash_combine(seed, static_cast<std::size_t>(background_color_.get_auto()));
+                        break;
+                    case color::type::indexed:
+                        hash_combine(seed, static_cast<std::size_t>(background_color_.get_index()));
+                        break;
+                    case color::type::theme:
+                        hash_combine(seed, static_cast<std::size_t>(background_color_.get_theme()));
+                        break;
+                }
+            }
+        }
+        else if(type_ == type::gradient)
+        {
+            hash_combine(seed, static_cast<std::size_t>(gradient_type_));
+            
+            if(gradient_type_ == gradient_type::path)
+            {
+                hash_combine(seed, gradient_path_left_);
+                hash_combine(seed, gradient_path_right_);
+                hash_combine(seed, gradient_path_top_);
+                hash_combine(seed, gradient_path_bottom_);
+            }
+            else if(gradient_type_ == gradient_type::linear)
+            {
+                hash_combine(seed, rotation_);
+            }
+        }
+        else if(type_ == type::solid)
+        {
+//            hash_combine(seed, static_cast<std::size_t>());
         }
         
         return seed;
diff --git a/samples/sample1.xlsx b/samples/sample1.xlsx
index 2b37bd1450f1b389f719fa247973e72b26279dfd..12da556a79bf71e246d21ea3db5763f160055740 100644
GIT binary patch
delta 5503
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

delta 2454
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
NY!Cp*{sW{J`!8Lx9u5Ei

diff --git a/source/reader/style_reader.cpp b/source/reader/style_reader.cpp
index b70ee959..640da5cc 100644
--- a/source/reader/style_reader.cpp
+++ b/source/reader/style_reader.cpp
@@ -280,6 +280,14 @@ void style_reader::read_fills(pugi::xml_node fills_node)
                 {
                     new_fill.set_background_color(color(color::type::indexed, bg_color_node.attribute("indexed").as_ullong()));
                 }
+                else if(bg_color_node.attribute("auto") != nullptr)
+                {
+                    new_fill.set_background_color(color(color::type::auto_, bg_color_node.attribute("auto").as_ullong()));
+                }
+                else if(bg_color_node.attribute("theme") != nullptr)
+                {
+                    new_fill.set_background_color(color(color::type::theme, bg_color_node.attribute("theme").as_ullong()));
+                }
             }
             
             auto fg_color_node = pattern_fill_node.child("fgColor");
@@ -290,6 +298,14 @@ void style_reader::read_fills(pugi::xml_node fills_node)
                 {
                     new_fill.set_foreground_color(color(color::type::indexed, fg_color_node.attribute("indexed").as_ullong()));
                 }
+                else if(fg_color_node.attribute("auto") != nullptr)
+                {
+                    new_fill.set_foreground_color(color(color::type::auto_, fg_color_node.attribute("auto").as_ullong()));
+                }
+                else if(fg_color_node.attribute("theme") != nullptr)
+                {
+                    new_fill.set_foreground_color(color(color::type::theme, fg_color_node.attribute("theme").as_ullong()));
+                }
             }
         }
 
diff --git a/source/workbook/workbook.cpp b/source/workbook/workbook.cpp
index e3997df4..7d378895 100644
--- a/source/workbook/workbook.cpp
+++ b/source/workbook/workbook.cpp
@@ -298,8 +298,16 @@ void workbook::remove_sheet(worksheet ws)
     {
         throw std::runtime_error("worksheet not owned by this workbook");
     }
-
     
+    auto sheet_filename = "xl/worksheets/sheet" + std::to_string(d_->worksheets_.size()) + ".xml";
+    auto rel_iter = std::find_if(d_->relationships_.begin(), d_->relationships_.end(), [=](relationship &r) { return r.get_target_uri() == sheet_filename; });
+    
+    if(rel_iter == d_->relationships_.end())
+    {
+        throw std::runtime_error("no matching rel found");
+    }
+    
+    d_->relationships_.erase(rel_iter);
     d_->worksheets_.erase(match_iter);
 }
 
diff --git a/source/writer/excel_writer.cpp b/source/writer/excel_writer.cpp
index a38e5a69..80d5b66c 100644
--- a/source/writer/excel_writer.cpp
+++ b/source/writer/excel_writer.cpp
@@ -108,14 +108,21 @@ void excel_writer::write_chartsheets(zip_file &/*archive*/)
 
 void excel_writer::write_worksheets(zip_file &archive, const std::vector<std::string> &shared_strings)
 {
-    for(auto relationship : wb_.get_relationships())
+    std::size_t index = 0;
+    
+    for(auto ws : wb_)
     {
-        if(relationship.get_type() == relationship::type::worksheet)
+        for(auto relationship : wb_.get_relationships())
         {
-            auto sheet_index = workbook::index_from_ws_filename(relationship.get_target_uri());
-            auto ws = wb_.get_sheet_by_index(sheet_index);
-            archive.writestr(relationship.get_target_uri(), write_worksheet(ws, shared_strings));
+            if(relationship.get_type() == relationship::type::worksheet &&
+               workbook::index_from_ws_filename(relationship.get_target_uri()) == index)
+            {
+                archive.writestr(relationship.get_target_uri(), write_worksheet(ws, shared_strings));
+                break;
+            }
         }
+        
+        index++;
     }
 }
 
diff --git a/source/writer/style_writer.cpp b/source/writer/style_writer.cpp
index e313ef68..fe58f3cb 100644
--- a/source/writer/style_writer.cpp
+++ b/source/writer/style_writer.cpp
@@ -356,6 +356,8 @@ std::string style_writer::write_table() const
         "ff000000",
         "ffaaaaaa",
         "ffbdc0bf",
+        "ffdbdbdb",
+        "ffbdc0bf",
         "ffdbdbdb"
     };