Commit 4a9abce1 authored by Alexey.Musinov's avatar Alexey.Musinov

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

* 'develop' of https://github.com/ONLYOFFICE/core:
  .
  x2t version up
parents a78711a1 04e4f1ad
......@@ -217,6 +217,7 @@ SOURCES += \
../src/odf/datatypes/tableorientation.cpp \
../src/odf/datatypes/tablefunction.cpp \
../src/odf/datatypes/tableorder.cpp \
../src/odf/datatypes/dategroup.cpp \
../src/docx/xlsx_conditionalFormatting.cpp \
../src/docx/xlsx_dxfs.cpp \
../src/docx/docx_content_type.cpp \
......
......@@ -126,3 +126,4 @@
#include "../src/odf/datatypes/tableorientation.cpp"
#include "../src/odf/datatypes/tablefunction.cpp"
#include "../src/odf/datatypes/tableorder.cpp"
#include "../src/odf/datatypes/dategroup.cpp"
......@@ -827,7 +827,7 @@ int xlsx_pivots_context::end_table()
impl_->serialize_view(view_strm);
impl_->serialize_cache(cache_strm);
std::wstring & str_view = view_strm.str();
std::wstring str_view = view_strm.str();
if (str_view.empty()) return -1;
......@@ -1088,4 +1088,4 @@ xlsx_pivots_context::~xlsx_pivots_context()
}
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.4.476.0
VERSION = 2.4.480.0
DEFINES += INTVER=$$VERSION
TARGET = x2t
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment