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

linux build

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

22
ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h
View File

@ -24,7 +24,7 @@ namespace PPTX
TableCols = oSrc.TableCols;
TableRows = oSrc.TableRows;
TableProperties = oSrc.TableProperties;
tableProperties = oSrc.tableProperties;
return *this;
}
@ -37,7 +37,7 @@ namespace PPTX
node.LoadArray(_T("a:tr"), TableRows);
TableProperties = node.ReadNode(_T("a:tblPr"));
tableProperties = node.ReadNode(_T("a:tblPr"));
FillParentPointersForChilds();
}
@ -45,7 +45,7 @@ namespace PPTX
virtual CString toXML() const
{
XmlUtils::CNodeValue oValue;
oValue.WriteNullable(TableProperties);
oValue.WriteNullable(tableProperties);
oValue.WriteArray(TableRows);
oValue.WriteArray(_T("a:tblGrid"), TableCols);
@ -54,7 +54,7 @@ namespace PPTX
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
{
pWriter->WriteRecord2(0, TableProperties);
pWriter->WriteRecord2(0, tableProperties);
pWriter->WriteRecordArray(1, 0, TableCols);
pWriter->WriteRecordArray(2, 0, TableRows);
}
@ -70,8 +70,8 @@ namespace PPTX
{
case 0:
{
TableProperties = new Logic::TableProperties();
TableProperties->fromPPTY(pReader);
tableProperties = new Logic::TableProperties();
tableProperties->fromPPTY(pReader);
break;
}
case 1:
@ -112,7 +112,7 @@ namespace PPTX
pWriter->StartNode(_T("a:tbl"));
pWriter->EndAttributes();
pWriter->Write(TableProperties);
pWriter->Write(tableProperties);
pWriter->WriteString(_T("<a:tblGrid>"));
size_t n1 = TableCols.size();
@ -130,12 +130,12 @@ namespace PPTX
public:
std::vector<TableCol> TableCols;
std::vector<TableRow> TableRows;
nullable<TableProperties> TableProperties;
nullable<TableProperties> tableProperties;
protected:
virtual void FillParentPointersForChilds()
{
if (TableProperties.IsInit())
TableProperties->SetParentPointer(this);
if (tableProperties.IsInit())
tableProperties->SetParentPointer(this);
size_t count = TableRows.size();
for (size_t i = 0; i < count; ++i)
@ -145,4 +145,4 @@ namespace PPTX
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_TABLE_INCLUDE_H_
#endif // PPTX_LOGIC_TABLE_INCLUDE_H_