diff --git a/cmake/common.cmake b/cmake/common.cmake index f1e1a258..7c8ba985 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -4,8 +4,6 @@ set(LIBRARY_VERSION 0.9.0) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - # Global platform-specific definitions if(MSVC) add_definitions(-DUNICODE -D_UNICODE) diff --git a/include/xlnt/worksheet/worksheet.hpp b/include/xlnt/worksheet/worksheet.hpp index 9c10a7e5..3044ca96 100644 --- a/include/xlnt/worksheet/worksheet.hpp +++ b/include/xlnt/worksheet/worksheet.hpp @@ -95,6 +95,8 @@ public: bool has_frozen_panes() const; // container + cell get_cell(column_t column, row_t row); + const cell get_cell(column_t column, row_t row) const; cell get_cell(const cell_reference &reference); const cell get_cell(const cell_reference &reference) const; bool has_cell(const cell_reference &reference) const; diff --git a/source/worksheet/worksheet.cpp b/source/worksheet/worksheet.cpp index 8f62b602..764b45e2 100644 --- a/source/worksheet/worksheet.cpp +++ b/source/worksheet/worksheet.cpp @@ -338,6 +338,16 @@ void worksheet::unfreeze_panes() d_->view_.get_pane().state = pane_state::normal; } +cell worksheet::get_cell(column_t column, row_t row) +{ + return get_cell(cell_reference(column, row)); +} + +const cell worksheet::get_cell(column_t column, row_t row) const +{ + return get_cell(cell_reference(column, row)); +} + cell worksheet::get_cell(const cell_reference &reference) { if (d_->cell_map_.find(reference.get_row()) == d_->cell_map_.end()) diff --git a/third-party/botan b/third-party/botan index 523b2a4c..923a95d5 160000 --- a/third-party/botan +++ b/third-party/botan @@ -1 +1 @@ -Subproject commit 523b2a4ca48fa5cf04ea371aabe7167ce2e5cd13 +Subproject commit 923a95d546df5b6d31f39b0af900d0361fb2e6a6