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

linux build

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59024 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Ivan.Shulga
2014-10-20 12:54:23 +00:00
committed by Alexander Trofimov
parent 6c3742da3a
commit 593c501012
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
View File

@ -56,7 +56,7 @@ namespace PPTX
XmlUtils::CXmlNode oNode1 = oNodeData.ReadNodeNoNS(_T("tbl"));
if (oNode1.IsValid())
{
Table = oNode1;
table = oNode1;
return;
}
XmlUtils::CXmlNode oNode2 = oNodeData.ReadNodeNoNS(_T("oleObj"));
@ -138,10 +138,10 @@ namespace PPTX
else
xfrm.toXmlWriter2(strNS, pWriter);
if (Table.is_init())
if (table.is_init())
{
pWriter->WriteString(_T("<a:graphic><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/table\">"));
Table->toXmlWriter(pWriter);
table->toXmlWriter(pWriter);
pWriter->WriteString(_T("</a:graphicData></a:graphic>"));
}
else if (chartRec.is_init())
@ -167,7 +167,7 @@ namespace PPTX
return;
}
if (smartArt.is_init() && !Table.is_init() && !chartRec.is_init() && !spid.is_init())
if (smartArt.is_init() && !table.is_init() && !chartRec.is_init() && !spid.is_init())
{
smartArt->LoadDrawing(pWriter);
if (smartArt->diag.is_init())
@ -207,7 +207,7 @@ namespace PPTX
return;
}
if (!Table.is_init() && !chartRec.is_init() && spid.is_init())
if (!table.is_init() && !chartRec.is_init() && spid.is_init())
{
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!!! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
pWriter->StartRecord(SPTREE_TYPE_PIC);
@ -265,7 +265,7 @@ namespace PPTX
pWriter->WriteRecord1(0, nvGraphicFramePr);
pWriter->WriteRecord1(1, xfrm);
pWriter->WriteRecord2(2, Table);
pWriter->WriteRecord2(2, table);
if (chartRec.is_init())
{
@ -318,8 +318,8 @@ namespace PPTX
}
case 2:
{
Table = new Logic::Table();
Table->fromPPTY(pReader);
table = new Logic::Table();
table->fromPPTY(pReader);
break;
}
case 3:
@ -376,8 +376,8 @@ namespace PPTX
{
xfrm.SetParentPointer(this);
nvGraphicFramePr.SetParentPointer(this);
if(Table.IsInit())
Table->SetParentPointer(this);
if(table.IsInit())
table->SetParentPointer(this);
if (smartArt.is_init())
smartArt->SetParentPointer(this);
if (chartRec.is_init())
@ -399,4 +399,4 @@ namespace PPTX
return filename;
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX

4
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h
View File

@ -43,7 +43,7 @@ namespace PPTX
//nullable_property<PPTX::RId> qs;
//nullable_property<PPTX::RId> cs;
nullable_string spid;
nullable<Table> Table;
nullable<Table> table;
nullable<SmartArt> smartArt;
nullable<ChartRec> chartRec;
nullable<Pic> pic;
@ -55,4 +55,4 @@ namespace PPTX
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_GRAPHICFRAME_INCLUDE_H
#endif // PPTX_LOGIC_GRAPHICFRAME_INCLUDE_H

12
ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
View File

@ -28,7 +28,7 @@ namespace PPTX
void TableCell::fromXML(XmlUtils::CXmlNode& node)
{
TxBody = node.ReadNodeNoNS(_T("txBody"));
txBody = node.ReadNodeNoNS(_T("txBody"));
CellProperties = node.ReadNode(_T("a:tcPr"));
node.ReadAttributeBase(L"rowSpan", RowSpan);
node.ReadAttributeBase(L"gridSpan", GridSpan);
@ -49,7 +49,7 @@ namespace PPTX
oAttr.Write(_T("id"), Id);
XmlUtils::CNodeValue oValue;
oValue.WriteNullable(TxBody);
oValue.WriteNullable(txBody);
oValue.WriteNullable(CellProperties);
return XmlUtils::CreateNode(_T("a:tc"), oAttr, oValue);
@ -57,8 +57,8 @@ namespace PPTX
void TableCell::FillParentPointersForChilds()
{
if(TxBody.IsInit())
TxBody->SetParentPointer(this);
if(txBody.IsInit())
txBody->SetParentPointer(this);
if(CellProperties.IsInit())
CellProperties->SetParentPointer(this);
}
@ -68,11 +68,11 @@ namespace PPTX
if(parentFileIs<Slide>())
{
parentFileAs<Slide>().FillShapeProperties(props, _T("table-cell"));
props.FillFromTextBody(TxBody);
props.FillFromTextBody(txBody);
//props.SetParentFilePointer(parentFile);
}
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX