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

[x2t] Fix omitted break statement; fix twice assignment mistake

Browse Source
This commit is contained in:
Sergey Konovalov
2020-08-30 17:04:46 +03:00
parent 4538a24327
commit c19d95dfb5
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTXFile/Editor/Drawing/Elements.h
View File

@ -411,7 +411,7 @@ namespace PPT_FORMAT
m_pShape->m_rcBounds = m_bChildAnchorEnabled ? m_rcChildAnchor : m_rcAnchor;
m_pShape->m_dStartTime = m_dStartTime;
m_pShape->m_dStartTime = m_dEndTime;
m_pShape->m_dEndTime = m_dEndTime;
m_bShapePreset = false;

2
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Ppt2PptxShapeConverter.h
View File

@ -2492,8 +2492,8 @@ namespace NSGuidesVML
oWriter.m_oWriter.AddIntNoCheck(lParam);
else
oWriter.m_oWriter.AddIntNoCheck(m_arIndexDst[lParam]);
break;
}
break;
case ptAdjust:
{
oWriter.m_oWriter.AddCharNoCheck((WCHAR)'a');

2
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Pptx2PptShapeConverter.h
View File

@ -134,8 +134,10 @@ namespace NSGuidesVML
{
case OOXMLShapes::sptCRect:
pPPTShape->m_eType = PPTShapes::sptCRect;
break;
case OOXMLShapes::sptCArc:
pPPTShape->m_eType = PPTShapes::sptCRect;
break;
default:
pPPTShape->m_eType = PPTShapes::sptCustom;
}

24
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View File

@ -2996,15 +2996,15 @@ namespace SimpleTypes
void SetValue(int nX, int nY, int nZ)
{
m_nX = nX;
m_nX = nY;
m_nX = nZ;
m_nY = nY;
m_nZ = nZ;
}
void SetValue(double dX, double dY, double dZ)
{
m_nX = (int)(dX * 65536);
m_nX = (int)(dY * 65536);
m_nX = (int)(dZ * 65536);
m_nY = (int)(dY * 65536);
m_nZ = (int)(dZ * 65536);
}
virtual double FromString(std::wstring &sValue)
@ -3085,8 +3085,8 @@ namespace SimpleTypes
void SetValue(int nX, int nY, int nZ)
{
m_nX = nX;
m_nX = nY;
m_nX = nZ;
m_nY = nY;
m_nZ = nZ;
}
virtual double FromString(std::wstring &sValue)
@ -3172,7 +3172,7 @@ namespace SimpleTypes
void SetValue(int nX, int nY)
{
m_nX = nX;
m_nX = nY;
m_nY = nY;
}
virtual double FromString(std::wstring &sValue)
@ -3242,7 +3242,7 @@ namespace SimpleTypes
void SetValue(double dX, double dY)
{
m_dX = dX;
m_dX = dY;
m_dY = dY;
}
virtual double FromString(std::wstring &sValue)
@ -4398,7 +4398,7 @@ namespace SimpleTypes
void SetValue(double dX, double dY)
{
m_dX = dX;
m_dX = dY;
m_dY = dY;
}
virtual double FromString(std::wstring &sValue)
@ -4464,7 +4464,7 @@ namespace SimpleTypes
void SetValue(double dX, double dY)
{
m_dX = dX;
m_dX = dY;
m_dY = dY;
}
virtual double FromString(std::wstring &sValue)
@ -4530,7 +4530,7 @@ namespace SimpleTypes
void SetValue(double dX, double dY)
{
m_dX = dX;
m_dX = dY;
m_dY = dY;
}
virtual double FromString(std::wstring &sValue)
@ -5337,7 +5337,7 @@ namespace SimpleTypes
void SetValue_Points(double dX, double dY)
{
m_dX = dX;
m_dX = dY;
m_dY = dY;
m_bUnitsX = true;
m_bUnitsY = true;