x2t ver. 2.0.2.387

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp

@@ -797,9 +797,9 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group)
 					bool bSet = false;
 					if (vml)
 					{
-						OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(vml->m_oSpt.GetValue());
-						if (sptType != OOX::Vml::SptType::sptNotPrimitive)
+                        if (vml->m_oSpt.IsInit())
 						{
+                            OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(vml->m_oSpt->GetValue());
                             odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
 							bSet = true;
 						}
@@ -827,7 +827,8 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group)
 				case OOX::et_v_shapetype:
 				{
 					OOX::Vml::CShapeType * vml = static_cast<OOX::Vml::CShapeType*>(vml_group->m_arrItems[i]);
-					OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(vml->m_oSpt.GetValue());
+                    OOX::Vml::SptType sptType = vml->m_oSpt.IsInit() ? static_cast<OOX::Vml::SptType>(vml->m_oSpt->GetValue()) : OOX::Vml::sptNotPrimitive;
+
                     odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
 						OoxConverter::convert(vml);			
 					odf_context()->drawing_context()->end_shape(); 

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -2003,7 +2003,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
 		}
 		else if (oox_pic->m_oShapeType.IsInit())
 		{
-			OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(oox_pic->m_oShapeType->m_oSpt.GetValue());
+            OOX::Vml::SptType sptType = oox_pic->m_oShapeType->m_oSpt.IsInit() ? static_cast<OOX::Vml::SptType>(oox_pic->m_oShapeType->m_oSpt->GetValue()) : OOX::Vml::sptNotPrimitive;
 
 			odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + boost::lexical_cast<std::wstring>(sptType));
 			odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
@@ -2018,7 +2018,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
 			bool bSet = false;
 			if (oox_pic->m_oShape.IsInit())
 			{
-				OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(oox_pic->m_oShape->m_oSpt.GetValue());
+                OOX::Vml::SptType sptType = oox_pic->m_oShapeType->m_oSpt.IsInit() ? static_cast<OOX::Vml::SptType>(oox_pic->m_oShapeType->m_oSpt->GetValue()) : OOX::Vml::sptNotPrimitive;
                 if (sptType != OOX::Vml::SptType::sptNotPrimitive)
 				{
 					odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + boost::lexical_cast<std::wstring>(sptType));
@@ -2075,7 +2075,8 @@ void DocxConverter::convert(OOX::Logic::CObject* oox_obj)
 	bool bSet = false;
 	if (oox_obj->m_oShape.IsInit())
 	{
-		OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(oox_obj->m_oShape->m_oSpt.GetValue());
+        OOX::Vml::SptType sptType = oox_obj->m_oShapeType->m_oSpt.IsInit() ? static_cast<OOX::Vml::SptType>(oox_obj->m_oShapeType->m_oSpt->GetValue()) : OOX::Vml::sptNotPrimitive;
+
         if (sptType != OOX::Vml::SptType::sptNotPrimitive)
 		{
 			odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + boost::lexical_cast<std::wstring>(sptType));

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h

@@ -118,7 +118,7 @@ namespace NSCustomVML
                     m_nCount = value;
                     break;
             }
-			return max(1, repeate);
+            return std::max(1, repeate);
 		}
 		void Read(POLE::Stream* pStream)
 		{

ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro

@@ -19,8 +19,12 @@ include(../../../Common/base.pri)
 #BOOST
 include($$PWD/../../../Common/3dParty/boost/boost.pri)
 
-DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED
-INCLUDEPATH += ../../../DesktopEditor/xml/libxml2/include
+DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED PPT_DEF
+
+
+INCLUDEPATH += \
+    ../../../DesktopEditor/freetype-2.5.2/include \
+    ../../../DesktopEditor/xml/libxml2/include
 
 core_mac {
     DEFINES += \

X2tConverter/build/Qt/X2tConverter.pro

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