Commit 3bdf44b8 authored by ElenaSubbotina's avatar ElenaSubbotina

Merge remote-tracking branch 'origin/hotfix/v5.0.1' into develop

parents eb6fb03c d5866980
......@@ -480,7 +480,7 @@ namespace formulasconvert {
else
{
size_t sz_workstr = workstr.length();
if (workstr.substr(0, min(3, sz_workstr)) == L"of:")//sample_02neu_crashes.ods
if (workstr.substr(0, std::min((size_t)3, sz_workstr)) == L"of:")//sample_02neu_crashes.ods
workstr = workstr.substr(3);
}
......
......@@ -38,7 +38,7 @@
#include <cpdoccore/xml/simple_xml_writer.h>
#include"../../Common/DocxFormat/Source/XML/Utils.h"
#include"../../Common/DocxFormat/Source/base/types_32.h"
#include"../../Common/DocxFormat/Source/Base/Types_32.h"
#include <map>
......
......@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.4.481.0
VERSION = 2.4.482.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