Commit 6c3742da 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@59023 954022d7-b5bf-4e40-9824-e11837661b57
parent 9d8272f0
...@@ -39,7 +39,7 @@ namespace PPTX ...@@ -39,7 +39,7 @@ namespace PPTX
pWriter->EndAttributes(); pWriter->EndAttributes();
pWriter->Write(TxBody); pWriter->Write(txBody);
pWriter->Write(CellProperties); pWriter->Write(CellProperties);
pWriter->EndNode(_T("a:tc")); pWriter->EndNode(_T("a:tc"));
...@@ -56,7 +56,7 @@ namespace PPTX ...@@ -56,7 +56,7 @@ namespace PPTX
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd); pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
pWriter->WriteRecord2(0, CellProperties); pWriter->WriteRecord2(0, CellProperties);
pWriter->WriteRecord2(1, TxBody); pWriter->WriteRecord2(1, txBody);
} }
virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader) virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
...@@ -115,9 +115,9 @@ namespace PPTX ...@@ -115,9 +115,9 @@ namespace PPTX
} }
case 1: case 1:
{ {
TxBody = new Logic::TxBody(); txBody = new Logic::TxBody();
TxBody->fromPPTY(pReader); txBody->fromPPTY(pReader);
TxBody->m_ns = _T("a"); txBody->m_ns = _T("a");
break; break;
} }
default: default:
...@@ -129,7 +129,7 @@ namespace PPTX ...@@ -129,7 +129,7 @@ namespace PPTX
} }
public: public:
nullable<TxBody> TxBody; nullable<TxBody> txBody;
nullable<TableCellProperties> CellProperties; nullable<TableCellProperties> CellProperties;
nullable_int RowSpan; nullable_int RowSpan;
nullable_int GridSpan; nullable_int GridSpan;
...@@ -142,4 +142,4 @@ namespace PPTX ...@@ -142,4 +142,4 @@ namespace PPTX
} // namespace Logic } // namespace Logic
} // namespace PPTX } // namespace PPTX
#endif // PPTX_LOGIC_TABLE_CELL_INCLUDE_H_ #endif // PPTX_LOGIC_TABLE_CELL_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