pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t v.2.0.2.386

Browse Source
This commit is contained in:
ElenaSubbotina
2016-08-25 15:07:36 +03:00
parent 5a9873b68a
commit 17047e6d48
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp Normal file → Executable file
View File

@ -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);
/////////////////////////////////////////////////////////////////////

2
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp
View File

@ -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.);

4
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View File

@ -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);

2
X2tConverter/build/Qt/X2tConverter.pro
View File

@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.385
VERSION = 2.0.2.386
DEFINES += INTVER=$$VERSION
TEMPLATE = app