StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #209 from pebble2015/master

Browse Source 
fix #204 #205
This commit is contained in:
Thomas Fussell 2017-09-02 10:10:35 -04:00 committed by GitHub
commit f174dd825d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xlnt/workbook/workbook_view.hpp
View File

@ -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

2
source/CMakeLists.txt
View File

@ -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} -DNDEBUG -Weverything -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation-unknown-command -Wno-unknown-pragmas")
endif()
if(APPLE)

4
source/detail/serialization/xlsx_consumer.cpp
View File

@ -1430,12 +1430,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"))