From 17047e6d480a2a98f0f37a9a9c28f44a6e8d5cf5 Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Thu, 25 Aug 2016 15:07:36 +0300 Subject: [PATCH] x2t v.2.0.2.386 --- .../source/OdfFormat/odf_page_layout_context.cpp | 2 ++ ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp | 2 +- ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp | 4 ++-- X2tConverter/build/Qt/X2tConverter.pro | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp diff --git a/ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp b/ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp old mode 100644 new mode 100755 index ee5a33f92a..1c49c506ea --- a/ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp +++ b/ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp @@ -329,6 +329,8 @@ bool odf_page_layout_context::add_footer(int type) if (!elm) return false; + if (master_state_list_.empty()) + start_master_page(L""); master_state_list_.back().add_footer(elm); ///////////////////////////////////////////////////////////////////// diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp b/ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp index 1868d9b0f8..a686e41063 100644 --- a/ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp +++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp @@ -803,7 +803,7 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group) odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); bSet = true; } - else if (vml->m_oConnectorType.GetValue() != SimpleTypes::connectortypeNone) + else if ((vml->m_oConnectorType.IsInit()) && (vml->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) { odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeStraightConnector1); odf_context()->drawing_context()->set_line_width(1.); diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp b/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp index dd85321e9c..d09c96438c 100644 --- a/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp +++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp @@ -2025,7 +2025,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic) odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); bSet = true; } - else if (oox_pic->m_oShape->m_oConnectorType.GetValue() != SimpleTypes::connectortypeNone) + else if ((oox_pic->m_oShape->m_oConnectorType.IsInit()) && (oox_pic->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) { odf_context()->drawing_context()->set_name(L"Connector"); odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeStraightConnector1); @@ -2082,7 +2082,7 @@ void DocxConverter::convert(OOX::Logic::CObject* oox_obj) odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); bSet = true; } - else if (oox_obj->m_oShape->m_oConnectorType.GetValue() != SimpleTypes::connectortypeNone) + else if ((oox_obj->m_oShape->m_oConnectorType.IsInit()) && (oox_obj->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) { odf_context()->drawing_context()->set_name(L"Connector"); odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeStraightConnector1); diff --git a/X2tConverter/build/Qt/X2tConverter.pro b/X2tConverter/build/Qt/X2tConverter.pro index 20d1642f4a..a660599328 100644 --- a/X2tConverter/build/Qt/X2tConverter.pro +++ b/X2tConverter/build/Qt/X2tConverter.pro @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.0.2.385 +VERSION = 2.0.2.386 DEFINES += INTVER=$$VERSION TEMPLATE = app