From f3d5d18035ef20ee8e923efe9f37ee518a6aa6ba Mon Sep 17 00:00:00 2001
From: pebble2015 <zhang.chen.yu@outlook.com>
Date: Sun, 27 Aug 2017 13:44:06 +0800
Subject: [PATCH] fix xwindow bug

fix xwindow bug
---
 CMakeLists.txt                                | 2 +-
 include/xlnt/workbook/workbook_view.hpp       | 4 ++--
 source/CMakeLists.txt                         | 2 +-
 source/detail/serialization/xlsx_consumer.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 482fea53..dfc81238 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(xlnt_all)
 set(COMBINED_PROJECT TRUE)
 
 # Library type
-option(STATIC "Set to ON to build xlnt as a static library instead of a shared library" OFF)
+option(STATIC "Set to ON to build xlnt as a static library instead of a shared library" ON)
 
 # Optional components
 option(TESTS "Set to OFF to skip building test executable (in ./tests)" ON)
diff --git a/include/xlnt/workbook/workbook_view.hpp b/include/xlnt/workbook/workbook_view.hpp
index b2c57029..d74c9a82 100644
--- a/include/xlnt/workbook/workbook_view.hpp
+++ b/include/xlnt/workbook/workbook_view.hpp
@@ -94,12 +94,12 @@ public:
     /// <summary>
     /// The distance of the workbook window from the left side of the screen in twips.
     /// </summary>
-    optional<std::size_t> x_window;
+    optional<int> x_window;
 
     /// <summary>
     /// The distance of the workbook window from the top of the screen in twips.
     /// </summary>
-    optional<std::size_t> y_window;
+    optional<int> y_window;
 };
 
 } // namespace xlnt
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 0404533a..b352314a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -31,7 +31,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unknown-pragmas")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation-unknown-command -Wno-unknown-pragmas")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation-unknown-command -Wno-unknown-pragmas")
 endif()
 
 if(APPLE)
diff --git a/source/detail/serialization/xlsx_consumer.cpp b/source/detail/serialization/xlsx_consumer.cpp
index 1c451e9f..35fbcd6f 100644
--- a/source/detail/serialization/xlsx_consumer.cpp
+++ b/source/detail/serialization/xlsx_consumer.cpp
@@ -1425,12 +1425,12 @@ void xlsx_consumer::read_office_document(const std::string &content_type) // CT_
 
                 if (parser().attribute_present("xWindow"))
                 {
-                    view.x_window = parser().attribute<std::size_t>("xWindow");
+                    view.x_window = parser().attribute<int>("xWindow");
                 }
 
                 if (parser().attribute_present("yWindow"))
                 {
-                    view.y_window = parser().attribute<std::size_t>("yWindow");
+                    view.y_window = parser().attribute<int>("yWindow");
                 }
 
                 if (parser().attribute_present("windowWidth"))