Commit dbb1a28d authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59025 954022d7-b5bf-4e40-9824-e11837661b57
parent 593c5010
...@@ -24,7 +24,7 @@ namespace PPTX ...@@ -24,7 +24,7 @@ namespace PPTX
TableCols = oSrc.TableCols; TableCols = oSrc.TableCols;
TableRows = oSrc.TableRows; TableRows = oSrc.TableRows;
TableProperties = oSrc.TableProperties; tableProperties = oSrc.tableProperties;
return *this; return *this;
} }
...@@ -37,7 +37,7 @@ namespace PPTX ...@@ -37,7 +37,7 @@ namespace PPTX
node.LoadArray(_T("a:tr"), TableRows); node.LoadArray(_T("a:tr"), TableRows);
TableProperties = node.ReadNode(_T("a:tblPr")); tableProperties = node.ReadNode(_T("a:tblPr"));
FillParentPointersForChilds(); FillParentPointersForChilds();
} }
...@@ -45,7 +45,7 @@ namespace PPTX ...@@ -45,7 +45,7 @@ namespace PPTX
virtual CString toXML() const virtual CString toXML() const
{ {
XmlUtils::CNodeValue oValue; XmlUtils::CNodeValue oValue;
oValue.WriteNullable(TableProperties); oValue.WriteNullable(tableProperties);
oValue.WriteArray(TableRows); oValue.WriteArray(TableRows);
oValue.WriteArray(_T("a:tblGrid"), TableCols); oValue.WriteArray(_T("a:tblGrid"), TableCols);
...@@ -54,7 +54,7 @@ namespace PPTX ...@@ -54,7 +54,7 @@ namespace PPTX
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
{ {
pWriter->WriteRecord2(0, TableProperties); pWriter->WriteRecord2(0, tableProperties);
pWriter->WriteRecordArray(1, 0, TableCols); pWriter->WriteRecordArray(1, 0, TableCols);
pWriter->WriteRecordArray(2, 0, TableRows); pWriter->WriteRecordArray(2, 0, TableRows);
} }
...@@ -70,8 +70,8 @@ namespace PPTX ...@@ -70,8 +70,8 @@ namespace PPTX
{ {
case 0: case 0:
{ {
TableProperties = new Logic::TableProperties(); tableProperties = new Logic::TableProperties();
TableProperties->fromPPTY(pReader); tableProperties->fromPPTY(pReader);
break; break;
} }
case 1: case 1:
...@@ -112,7 +112,7 @@ namespace PPTX ...@@ -112,7 +112,7 @@ namespace PPTX
pWriter->StartNode(_T("a:tbl")); pWriter->StartNode(_T("a:tbl"));
pWriter->EndAttributes(); pWriter->EndAttributes();
pWriter->Write(TableProperties); pWriter->Write(tableProperties);
pWriter->WriteString(_T("<a:tblGrid>")); pWriter->WriteString(_T("<a:tblGrid>"));
size_t n1 = TableCols.size(); size_t n1 = TableCols.size();
...@@ -130,12 +130,12 @@ namespace PPTX ...@@ -130,12 +130,12 @@ namespace PPTX
public: public:
std::vector<TableCol> TableCols; std::vector<TableCol> TableCols;
std::vector<TableRow> TableRows; std::vector<TableRow> TableRows;
nullable<TableProperties> TableProperties; nullable<TableProperties> tableProperties;
protected: protected:
virtual void FillParentPointersForChilds() virtual void FillParentPointersForChilds()
{ {
if (TableProperties.IsInit()) if (tableProperties.IsInit())
TableProperties->SetParentPointer(this); tableProperties->SetParentPointer(this);
size_t count = TableRows.size(); size_t count = TableRows.size();
for (size_t i = 0; i < count; ++i) for (size_t i = 0; i < count; ++i)
...@@ -145,4 +145,4 @@ namespace PPTX ...@@ -145,4 +145,4 @@ namespace PPTX
} // namespace Logic } // namespace Logic
} // namespace PPTX } // namespace PPTX
#endif // PPTX_LOGIC_TABLE_INCLUDE_H_ #endif // PPTX_LOGIC_TABLE_INCLUDE_H_
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment