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

(2.0.0.183): ASCOfficeDocxFile2

Browse Source 
Bug 26620 - Ошибка в консоли при попытке пересохранения XLSX книги или поврежденная версия после редактирования.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58501 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2014-09-26 07:26:13 +00:00
committed by Alexander Trofimov
parent b4c6725e0d
commit 19c9525993
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ASCOfficeDocxFile2/version.h
View File

@ -2,6 +2,6 @@
//2
//0
//0
//182
#define INTVER 2,0,0,182
#define STRVER "2,0,0,182\0"
//183
#define INTVER 2,0,0,183
#define STRVER "2,0,0,183\0"

5
ASCOfficePPTXFile/PPTXFormat/Logic/CustGeom.h
View File

@ -102,7 +102,10 @@ namespace PPTX
pWriter->Write(rect);
else
pWriter->WriteString(_T("<a:rect l=\"0\" t=\"0\" r=\"r\" b=\"b\"/>"));
pWriter->WriteArray(_T("a:pathLst"), pathLst);
if (pathLst.size() == 0)
pWriter->WriteString(_T("<a:pathLst/>"));
else
pWriter->WriteArray(_T("a:pathLst"), pathLst);
pWriter->EndNode(_T("a:custGeom"));
}

2
ASCOfficePPTXFile/PPTXFormat/Logic/DefaultShapeDefinition.h
View File

@ -126,7 +126,9 @@ namespace PPTX
pWriter->StartNode(_T("a:") + m_name);
pWriter->EndAttributes();
pWriter->m_lFlag = 0x04;
spPr.toXmlWriter(pWriter);
pWriter->m_lFlag = 0;
bodyPr.toXmlWriter(pWriter);
lstStyle.toXmlWriter(pWriter);
pWriter->Write(style);

14
ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.h
View File

@ -42,7 +42,12 @@ namespace PPTX
else if (pWriter->m_lDocType == XMLWRITER_DOC_TYPE_CHART)
pWriter->StartNode(_T("c:spPr"));
else
pWriter->StartNode(_T("p:spPr"));
{
if (0 != (pWriter->m_lFlag & 0x04))//theme
pWriter->StartNode(_T("a:spPr"));
else
pWriter->StartNode(_T("p:spPr"));
}
pWriter->StartAttributes();
pWriter->WriteAttribute(_T("bwMode"), bwMode);
@ -74,7 +79,12 @@ namespace PPTX
else if (pWriter->m_lDocType == XMLWRITER_DOC_TYPE_CHART)
pWriter->EndNode(_T("c:spPr"));
else
pWriter->EndNode(_T("p:spPr"));
{
if (0 != (pWriter->m_lFlag & 0x04))//theme
pWriter->EndNode(_T("a:spPr"));
else
pWriter->EndNode(_T("p:spPr"));
}
}
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const