x2t v.2.0.2.386

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

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

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

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