From a84425b49f2d0997b8564a76fa8b0b5d62b173f9 Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Mon, 12 Dec 2016 11:43:10 +0300 Subject: [PATCH] x2t 2.0.2.420 --- ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp | 6 +++--- ASCOfficeOdfFile/src/odf/styles_lite_container.cpp | 4 ++-- X2tConverter/build/Qt/X2tConverter.pri | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp b/ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp index 06b5f441ba..1988237325 100644 --- a/ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp +++ b/ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp @@ -141,9 +141,9 @@ public: if (c.rules[j].text) CP_XML_ATTR(L"text", *c.rules[j].text); if (c.rules[j].rank) CP_XML_ATTR(L"rank", *c.rules[j].rank); - //CP_XML_ATTR(L"bottom" , 0); - //CP_XML_ATTR(L"equalAverage" , 0); - //CP_XML_ATTR(L"aboveAverage" , 0); + //CP_XML_ATTR(L"bottom" , 0); + //CP_XML_ATTR(L"equalAverage" , 0); + //CP_XML_ATTR(L"aboveAverage" , 0); if (c.rules[j].type == 1) { CP_XML_ATTR(L"type", *c.rules[j].formula_type); diff --git a/ASCOfficeOdfFile/src/odf/styles_lite_container.cpp b/ASCOfficeOdfFile/src/odf/styles_lite_container.cpp index 0159eaa5ef..d576796dc1 100644 --- a/ASCOfficeOdfFile/src/odf/styles_lite_container.cpp +++ b/ASCOfficeOdfFile/src/odf/styles_lite_container.cpp @@ -104,7 +104,7 @@ struct view_elm : settings_elm class settings_container::Impl { public: - settings_container::Impl() : inViewTable(false), inView(false) {} + Impl() : inViewTable(false), inView(false) {} settings_elm common; settings_elm common_view; @@ -266,4 +266,4 @@ _CP_OPT(std::wstring) settings_container::find_view_by_name(const std::wstring & } } -} \ No newline at end of file +} diff --git a/X2tConverter/build/Qt/X2tConverter.pri b/X2tConverter/build/Qt/X2tConverter.pri index 6fb76c382f..ebc501f812 100644 --- a/X2tConverter/build/Qt/X2tConverter.pri +++ b/X2tConverter/build/Qt/X2tConverter.pri @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.0.2.417 +VERSION = 2.0.2.420 DEFINES += INTVER=$$VERSION TARGET = x2t