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

x2t -fix users files

Browse Source
This commit is contained in:
ElenaSubbotina
2018-04-02 17:14:46 +03:00
parent e1a8bd3b3d
commit d9bd1cdb32
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp
View File

@ -2026,11 +2026,19 @@ namespace DocFileFormat
nElemSize = 4;
bTruncated = true;
}
if (nElemSize == 0)
{
nElemSize = 2; //enredobar.doc
}
long dwSize = nElems * nElemSize;
if (opGuides->op - 6 != (dwSize))
{
bool b = false;
if (nElems > 0x7fff)
{
dwSize = (opGuides->op - 6);
}
}
int count = dwSize / nElemSize; //1x (int or short)
for (int i = 0; i < count; ++i)
@ -2070,12 +2078,19 @@ namespace DocFileFormat
nElemSize = 4;
bTruncated = true;
}
if (nElemSize == 0)
{
nElemSize = 2; //enredobar.doc
}
long dwSize = nElems * nElemSize;
if (opLocs->op - 6 != (dwSize))
{
bool b = false;
if (nElems > 0x7fff)
{
dwSize = (opLocs->op - 6);
}
}
int count = dwSize / nElemSize; //2x (int or short)

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.cpp
View File

@ -70,6 +70,13 @@ namespace XLS
L"333399", L"000000", L"FFFFFF", L"FF0000", L"00FF00", L"0000FF", L"FFFF00", L"FF00FF", L"00FFFF", L"800000",
L"800000", L"800000", L"808000", L"800080", L"808000", L"C0C0C0", L"808080", L"9999FF", L"993366", L"FFFFCC",
L"CCFFFF", L"660066", L"FF8080", L"0066CC", L"CCCCFF",
//todoooo - подглядеть какие в мс далее
L"800000", L"FF00FF", L"FFFF00", L"00FFFF", L"800080", L"800000", L"808000", L"0000FF", L"00CCFF", L"CCFFFF",
L"CCFFCC", L"FFFF99", L"99CCFF", L"FF99CC", L"CC99FF", L"FFCC99", L"3366FF", L"33CCCC", L"99CC00", L"FFCC00",
L"FF9900", L"FF6600", L"666699", L"969696", L"336600", L"339966", L"330000", L"333300", L"993300", L"993366",
L"333399", L"000000", L"FFFFFF", L"FF0000", L"00FF00", L"0000FF", L"FFFF00", L"FF00FF", L"00FFFF", L"800000",
L"800000", L"800000", L"808000", L"800080", L"808000", L"C0C0C0", L"808080", L"9999FF", L"993366", L"FFFFCC",
L"CCFFFF", L"660066", L"FF8080", L"0066CC", L"CCCCFF"
};