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 ver. 2.0.2.387

Browse Source
This commit is contained in:
ElenaSubbotina
2016-08-26 14:08:01 +03:00
parent 2f6c564e1a
commit 6e736c4844
5 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -797,10 +797,10 @@ 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())
{
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
OOX::Vml::SptType sptType = static_cast<OOX::Vml::SptType>(vml->m_oSpt->GetValue());
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
bSet = true;
}
else if ((vml->m_oConnectorType.IsInit()) && (vml->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone))
@ -827,8 +827,9 @@ 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());
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
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();
}break;

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

@ -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,8 +2018,8 @@ 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());
if (sptType != OOX::Vml::SptType::sptNotPrimitive)
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));
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));
@ -2075,8 +2075,9 @@ 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());
if (sptType != OOX::Vml::SptType::sptNotPrimitive)
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));
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType));

82
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h
View File

@ -74,51 +74,51 @@ namespace NSCustomVML
int Read(WORD value)
{
int repeate = 0;
if (value >= 0x2000 && value < 0x20FF)
{
repeate = value & 0x0FFF;
value &= 0xFF00;
}
m_nCount = 0;
switch (value)
{
case 0x0001: // lineto
m_eRuler = rtLineTo;
m_nCount = 1;
break;
case 0x4000: // moveto
m_eRuler = rtMoveTo;
m_nCount = 1;
break;
case 0x2000: // curveto
m_eRuler = rtCurveTo;
m_nCount = 3;
break;
case 0xb300: // arcto
m_eRuler = rtArc;
m_nCount = 2;
break;
case 0xac00:
case 0xaa00: // nofill
case 0xad00:
if (value >= 0x2000 && value < 0x20FF)
{
repeate = value & 0x0FFF;
value &= 0xFF00;
}
m_nCount = 0;
switch (value)
{
case 0x0001: // lineto
m_eRuler = rtLineTo;
m_nCount = 1;
break;
case 0x4000: // moveto
m_eRuler = rtMoveTo;
m_nCount = 1;
break;
case 0x2000: // curveto
m_eRuler = rtCurveTo;
m_nCount = 3;
break;
case 0xb300: // arcto
m_eRuler = rtArc;
m_nCount = 2;
break;
case 0xac00:
case 0xaa00: // nofill
case 0xad00:
m_eRuler = rtNoFill;
break;
case 0xab00: // nostroke
case 0xab00: // nostroke
m_eRuler = rtNoStroke;
break;
case 0x6001: // close
m_eRuler = rtClose;
break;
case 0x8000: // end
m_eRuler = rtEnd;
break;
default: // given number of lineto elements
m_eRuler = rtLineTo;
m_nCount = value;
break;
break;
case 0x6001: // close
m_eRuler = rtClose;
break;
case 0x8000: // end
m_eRuler = rtEnd;
break;
default: // given number of lineto elements
m_eRuler = rtLineTo;
m_nCount = value;
break;
}
return max(1, repeate);
return std::max(1, repeate);
}
void Read(POLE::Stream* pStream)
{

8
ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro
View File

@ -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 += \

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

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