From eff00f9540b45d8be76c77f57597e3b296d89dfe Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Sat, 3 Dec 2016 10:46:11 +0100
Subject: [PATCH] specify enum class type differently for msvc build

---
 include/xlnt/packaging/relationship.hpp |  2 +-
 include/xlnt/worksheet/page_setup.hpp   | 16 ++++++++--------
 include/xlnt/worksheet/worksheet.hpp    |  2 +-
 source/packaging/relationship.cpp       |  2 +-
 source/workbook/workbook.cpp            | 10 ++++++++--
 source/worksheet/page_setup.cpp         |  8 ++++----
 source/worksheet/worksheet.cpp          |  2 +-
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/include/xlnt/packaging/relationship.hpp b/include/xlnt/packaging/relationship.hpp
index 168d389d..e82d8271 100644
--- a/include/xlnt/packaging/relationship.hpp
+++ b/include/xlnt/packaging/relationship.hpp
@@ -169,7 +169,7 @@ private:
     /// <summary>
     ///
     /// </summary>
-    enum target_mode mode_;
+    xlnt::target_mode mode_;
 };
 
 } // namespace xlnt
diff --git a/include/xlnt/worksheet/page_setup.hpp b/include/xlnt/worksheet/page_setup.hpp
index 362deb4a..8f180072 100644
--- a/include/xlnt/worksheet/page_setup.hpp
+++ b/include/xlnt/worksheet/page_setup.hpp
@@ -50,7 +50,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void page_break(enum page_break b);
+    void page_break(xlnt::page_break b);
 
     /// <summary>
     ///
@@ -60,7 +60,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void sheet_state(enum sheet_state sheet_state);
+    void sheet_state(xlnt::sheet_state sheet_state);
 
     /// <summary>
     ///
@@ -70,7 +70,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void paper_size(enum paper_size paper_size);
+    void paper_size(xlnt::paper_size paper_size);
 
     /// <summary>
     ///
@@ -80,7 +80,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void orientation(enum orientation orientation);
+    void orientation(xlnt::orientation orientation);
 
     /// <summary>
     ///
@@ -146,22 +146,22 @@ private:
     /// <summary>
     ///
     /// </summary>
-    enum page_break break_;
+    xlnt::page_break break_;
 
     /// <summary>
     ///
     /// </summary>
-    enum sheet_state sheet_state_;
+    xlnt::sheet_state sheet_state_;
 
     /// <summary>
     ///
     /// </summary>
-    enum paper_size paper_size_;
+    xlnt::paper_size paper_size_;
 
     /// <summary>
     ///
     /// </summary>
-    enum orientation orientation_;
+    xlnt::orientation orientation_;
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/worksheet.hpp b/include/xlnt/worksheet/worksheet.hpp
index 0366e308..95479b3f 100644
--- a/include/xlnt/worksheet/worksheet.hpp
+++ b/include/xlnt/worksheet/worksheet.hpp
@@ -625,7 +625,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void sheet_state(enum sheet_state state);
+    void sheet_state(xlnt::sheet_state state);
 
     /// <summary>
     ///
diff --git a/source/packaging/relationship.cpp b/source/packaging/relationship.cpp
index d17f01ea..e4493a38 100644
--- a/source/packaging/relationship.cpp
+++ b/source/packaging/relationship.cpp
@@ -30,7 +30,7 @@ relationship::relationship()
 {
 }
 
-relationship::relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, enum target_mode mode)
+relationship::relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, xlnt::target_mode mode)
 	: id_(id),
 	type_(t),
 	source_(source),
diff --git a/source/workbook/workbook.cpp b/source/workbook/workbook.cpp
index de8657ca..5836411c 100644
--- a/source/workbook/workbook.cpp
+++ b/source/workbook/workbook.cpp
@@ -1012,7 +1012,10 @@ void swap(workbook &left, workbook &right)
 			ws.parent(left);
 		}
 
-        left.d_->stylesheet_->parent = &left;
+		if (left.d_->stylesheet_.is_set())
+		{
+			left.d_->stylesheet_->parent = &left;
+		}
 	}
 
 	if (right.d_ != nullptr)
@@ -1022,7 +1025,10 @@ void swap(workbook &left, workbook &right)
 			ws.parent(right);
 		}
 
-        right.d_->stylesheet_->parent = &right;
+		if (left.d_->stylesheet_.is_set())
+		{
+			right.d_->stylesheet_->parent = &right;
+		}
 	}
 }
 
diff --git a/source/worksheet/page_setup.cpp b/source/worksheet/page_setup.cpp
index 535f9603..e667b1b9 100644
--- a/source/worksheet/page_setup.cpp
+++ b/source/worksheet/page_setup.cpp
@@ -44,7 +44,7 @@ page_break page_setup::page_break() const
     return break_;
 }
 
-void page_setup::page_break(enum page_break b)
+void page_setup::page_break(xlnt::page_break b)
 {
     break_ = b;
 }
@@ -54,7 +54,7 @@ sheet_state page_setup::sheet_state() const
     return sheet_state_;
 }
 
-void page_setup::sheet_state(enum sheet_state sheet_state)
+void page_setup::sheet_state(xlnt::sheet_state sheet_state)
 {
     sheet_state_ = sheet_state;
 }
@@ -64,7 +64,7 @@ paper_size page_setup::paper_size() const
     return paper_size_;
 }
 
-void page_setup::paper_size(enum paper_size paper_size)
+void page_setup::paper_size(xlnt::paper_size paper_size)
 {
     paper_size_ = paper_size;
 }
@@ -74,7 +74,7 @@ orientation page_setup::orientation() const
     return orientation_;
 }
 
-void page_setup::orientation(enum orientation orientation)
+void page_setup::orientation(xlnt::orientation orientation)
 {
     orientation_ = orientation;
 }
diff --git a/source/worksheet/worksheet.cpp b/source/worksheet/worksheet.cpp
index 30edd8b4..3c74c04b 100644
--- a/source/worksheet/worksheet.cpp
+++ b/source/worksheet/worksheet.cpp
@@ -926,7 +926,7 @@ cell_reference worksheet::point_pos(const std::pair<int, int> &point) const
     return point_pos(point.first, point.second);
 }
 
-void worksheet::sheet_state(enum sheet_state state)
+void worksheet::sheet_state(xlnt::sheet_state state)
 {
     page_setup().sheet_state(state);
 }