From 593c50101270ecaa23cefbbebe2b62cd15b4543e Mon Sep 17 00:00:00 2001
From: "Ivan.Shulga" <Ivan.Shulga@onlyoffice.com>
Date: Mon, 20 Oct 2014 12:54:23 +0000
Subject: [PATCH] linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59024 954022d7-b5bf-4e40-9824-e11837661b57
---
 .../PPTXFormat/Logic/GraphicFrame.cpp         | 22 +++++++++----------
 .../PPTXFormat/Logic/GraphicFrame.h           |  4 ++--
 .../PPTXFormat/Logic/Table/TableCell.cpp      | 12 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
index 86d9ea545d..a3e35928ae 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
@@ -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())
 			{				
 				// заглушка!!! делаем картинку
 				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
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h
index dfdf136002..b918e26c77 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h
@@ -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
\ No newline at end of file
+#endif // PPTX_LOGIC_GRAPHICFRAME_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
index 1cfd4c3996..763a662a23 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
@@ -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
\ No newline at end of file
+} // namespace PPTX