Commit 0343c057 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@59047 954022d7-b5bf-4e40-9824-e11837661b57
parent 474fedf7
...@@ -22,7 +22,7 @@ namespace PPTX ...@@ -22,7 +22,7 @@ namespace PPTX
node.ReadAttributeBase(L"i", i); node.ReadAttributeBase(L"i", i);
node.ReadAttributeBase(L"b", b); node.ReadAttributeBase(L"b", b);
FontRef = node.ReadNodeNoNS(_T("fontRef")); fontRef = node.ReadNodeNoNS(_T("fontRef"));
Color.GetColorFrom(node); Color.GetColorFrom(node);
FillParentPointersForChilds(); FillParentPointersForChilds();
...@@ -34,7 +34,7 @@ namespace PPTX ...@@ -34,7 +34,7 @@ namespace PPTX
oAttr.WriteLimitNullable(_T("b"), b); oAttr.WriteLimitNullable(_T("b"), b);
XmlUtils::CNodeValue oValue; XmlUtils::CNodeValue oValue;
oValue.WriteNullable(FontRef); oValue.WriteNullable(fontRef);
oValue.Write(Color); oValue.Write(Color);
return XmlUtils::CreateNode(_T("a:tcTxStyle"), oAttr, oValue); return XmlUtils::CreateNode(_T("a:tcTxStyle"), oAttr, oValue);
...@@ -49,7 +49,7 @@ namespace PPTX ...@@ -49,7 +49,7 @@ namespace PPTX
pWriter->WriteAttribute(_T("b"), b); pWriter->WriteAttribute(_T("b"), b);
pWriter->EndAttributes(); pWriter->EndAttributes();
pWriter->Write(FontRef); pWriter->Write(fontRef);
Color.toXmlWriter(pWriter); Color.toXmlWriter(pWriter);
pWriter->EndNode(_T("a:tcTxStyle")); pWriter->EndNode(_T("a:tcTxStyle"));
...@@ -62,7 +62,7 @@ namespace PPTX ...@@ -62,7 +62,7 @@ namespace PPTX
pWriter->WriteLimit2(1, b); pWriter->WriteLimit2(1, b);
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd); pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
pWriter->WriteRecord2(0, FontRef); pWriter->WriteRecord2(0, fontRef);
pWriter->WriteRecord1(1, Color); pWriter->WriteRecord1(1, Color);
} }
...@@ -103,9 +103,9 @@ namespace PPTX ...@@ -103,9 +103,9 @@ namespace PPTX
{ {
case 0: case 0:
{ {
FontRef = new Logic::FontRef(); fontRef = new Logic::FontRef();
FontRef->fromPPTY(pReader); fontRef->fromPPTY(pReader);
FontRef->m_name = _T("a:fontRef"); fontRef->m_name = _T("a:fontRef");
break; break;
} }
case 1: case 1:
...@@ -129,13 +129,13 @@ font (Font) ...@@ -129,13 +129,13 @@ font (Font)
// fontCollection (. ), Font // fontCollection (. ), Font
// //
*/ */
nullable<FontRef> FontRef; nullable<FontRef> fontRef;
UniColor Color; UniColor Color;
protected: protected:
virtual void FillParentPointersForChilds() virtual void FillParentPointersForChilds()
{ {
if(FontRef.IsInit()) if(fontRef.IsInit())
FontRef->SetParentPointer(this); fontRef->SetParentPointer(this);
Color.SetParentPointer(this); Color.SetParentPointer(this);
} }
}; };
......
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