Commit 9d8272f0 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@59022 954022d7-b5bf-4e40-9824-e11837661b57
parent 40e0718e
...@@ -30,7 +30,7 @@ namespace PPTX ...@@ -30,7 +30,7 @@ namespace PPTX
LnB = oSrc.LnB; LnB = oSrc.LnB;
LnTlToBr = oSrc.LnTlToBr; LnTlToBr = oSrc.LnTlToBr;
LnBlToTr = oSrc.LnBlToTr; LnBlToTr = oSrc.LnBlToTr;
Cell3D = oSrc.Cell3D; cell3D = oSrc.cell3D;
Fill = oSrc.Fill; Fill = oSrc.Fill;
MarL = oSrc.MarL; MarL = oSrc.MarL;
...@@ -53,7 +53,7 @@ namespace PPTX ...@@ -53,7 +53,7 @@ namespace PPTX
LnB = node.ReadNode(_T("a:lnB")); LnB = node.ReadNode(_T("a:lnB"));
LnTlToBr = node.ReadNode(_T("a:lnTlToBr")); LnTlToBr = node.ReadNode(_T("a:lnTlToBr"));
LnBlToTr = node.ReadNode(_T("a:lnBlToTr")); LnBlToTr = node.ReadNode(_T("a:lnBlToTr"));
Cell3D = node.ReadNode(_T("a:cell3D")); cell3D = node.ReadNode(_T("a:cell3D"));
Fill.GetFillFrom(node); Fill.GetFillFrom(node);
// <xsd:element name="headers" type="CT_Headers" minOccurs="0"/> // <xsd:element name="headers" type="CT_Headers" minOccurs="0"/>
...@@ -88,7 +88,7 @@ namespace PPTX ...@@ -88,7 +88,7 @@ namespace PPTX
oValue.WriteNullable(LnB); oValue.WriteNullable(LnB);
oValue.WriteNullable(LnTlToBr); oValue.WriteNullable(LnTlToBr);
oValue.WriteNullable(LnBlToTr); oValue.WriteNullable(LnBlToTr);
oValue.WriteNullable(Cell3D); oValue.WriteNullable(cell3D);
oValue.Write(Fill); oValue.Write(Fill);
return XmlUtils::CreateNode(_T("a:tcPr"), oAttr, oValue); return XmlUtils::CreateNode(_T("a:tcPr"), oAttr, oValue);
...@@ -118,7 +118,7 @@ namespace PPTX ...@@ -118,7 +118,7 @@ namespace PPTX
pWriter->Write(LnTlToBr); pWriter->Write(LnTlToBr);
pWriter->Write(LnBlToTr); pWriter->Write(LnBlToTr);
Fill.toXmlWriter(pWriter); Fill.toXmlWriter(pWriter);
pWriter->Write(Cell3D); pWriter->Write(cell3D);
pWriter->EndNode(_T("a:tcPr")); pWriter->EndNode(_T("a:tcPr"));
} }
...@@ -143,7 +143,7 @@ namespace PPTX ...@@ -143,7 +143,7 @@ namespace PPTX
pWriter->WriteRecord2(4, LnTlToBr); pWriter->WriteRecord2(4, LnTlToBr);
pWriter->WriteRecord2(5, LnBlToTr); pWriter->WriteRecord2(5, LnBlToTr);
pWriter->WriteRecord1(6, Fill); pWriter->WriteRecord1(6, Fill);
pWriter->WriteRecord2(7, Cell3D); pWriter->WriteRecord2(7, cell3D);
} }
virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader) virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
...@@ -261,8 +261,8 @@ namespace PPTX ...@@ -261,8 +261,8 @@ namespace PPTX
} }
case 7: case 7:
{ {
Cell3D = new Logic::Cell3D(); cell3D = new Logic::Cell3D();
Cell3D->fromPPTY(pReader); cell3D->fromPPTY(pReader);
break; break;
} }
default: default:
...@@ -280,7 +280,7 @@ namespace PPTX ...@@ -280,7 +280,7 @@ namespace PPTX
nullable<Ln> LnB; nullable<Ln> LnB;
nullable<Ln> LnTlToBr; nullable<Ln> LnTlToBr;
nullable<Ln> LnBlToTr; nullable<Ln> LnBlToTr;
nullable<Cell3D> Cell3D; nullable<Cell3D> cell3D;
UniFill Fill; UniFill Fill;
// <xsd:element name="headers" type="CT_Headers" minOccurs="0"/> // <xsd:element name="headers" type="CT_Headers" minOccurs="0"/>
...@@ -308,8 +308,8 @@ namespace PPTX ...@@ -308,8 +308,8 @@ namespace PPTX
if(LnBlToTr.IsInit()) if(LnBlToTr.IsInit())
LnBlToTr->SetParentPointer(this); LnBlToTr->SetParentPointer(this);
if(Cell3D.IsInit()) if(cell3D.IsInit())
Cell3D->SetParentPointer(this); cell3D->SetParentPointer(this);
if(Fill.is_init()) if(Fill.is_init())
Fill.SetParentPointer(this); Fill.SetParentPointer(this);
} }
...@@ -317,4 +317,4 @@ namespace PPTX ...@@ -317,4 +317,4 @@ namespace PPTX
} // namespace Logic } // namespace Logic
} // namespace PPTX } // namespace PPTX
#endif // PPTX_LOGIC_TABLE_CELLPROPERTIES_INCLUDE_H_ #endif // PPTX_LOGIC_TABLE_CELLPROPERTIES_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