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

fix some rough edges

Browse Source
This commit is contained in:
Thomas Fussell 2017-04-13 14:57:27 -04:00
parent 835e36d6ae
commit 62f659b901
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -17,12 +17,6 @@ if(NOT MSVC)
option(COVERAGE "Generate coverage data using gcov" OFF) option(COVERAGE "Generate coverage data using gcov" OFF)
endif() endif()
if(STATIC)
set(ZLIB_LIBRARY libz.a)
set(CRYPTOPP_LIBRARY libcryptopp.a)
set(EXPAT_LIBRARY libexpat.a)
endif()
# Add components according to selected options # Add components according to selected options
if(SAMPLES) if(SAMPLES)
add_subdirectory(samples) add_subdirectory(samples)

10
include/xlnt/cell/rich_text_run.hpp
View File

@ -39,15 +39,9 @@ struct rich_text_run
std::string first; std::string first;
optional<font> second; optional<font> second;
bool operator==(const rich_text_run &other) const bool operator==(const rich_text_run &other) const;
{
return first == other.first && second == other.second;
}
bool operator!=(const rich_text_run &other) const bool operator!=(const rich_text_run &other) const;
{
return !(*this == other);
}
}; };
} // namespace xlnt } // namespace xlnt

2
source/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
project(xlnt VERSION 0.9.4) project(xlnt VERSION 0.9.5)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)

10
source/cell/rich_text_run.cpp
View File

@ -25,4 +25,14 @@
namespace xlnt { namespace xlnt {
bool rich_text_run::operator==(const rich_text_run &other) const
{
return first == other.first && second == other.second;
}
bool rich_text_run::operator!=(const rich_text_run &other) const
{
return !(*this == other);
}
} // namespace xlnt } // namespace xlnt