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
node.ReadAttributeBase(L"i", i);
node.ReadAttributeBase(L"b", b);
FontRef = node.ReadNodeNoNS(_T("fontRef"));
fontRef = node.ReadNodeNoNS(_T("fontRef"));
Color.GetColorFrom(node);
FillParentPointersForChilds();
......@@ -34,7 +34,7 @@ namespace PPTX
oAttr.WriteLimitNullable(_T("b"), b);
XmlUtils::CNodeValue oValue;
oValue.WriteNullable(FontRef);
oValue.WriteNullable(fontRef);
oValue.Write(Color);
return XmlUtils::CreateNode(_T("a:tcTxStyle"), oAttr, oValue);
......@@ -49,7 +49,7 @@ namespace PPTX
pWriter->WriteAttribute(_T("b"), b);
pWriter->EndAttributes();
pWriter->Write(FontRef);
pWriter->Write(fontRef);
Color.toXmlWriter(pWriter);
pWriter->EndNode(_T("a:tcTxStyle"));
......@@ -62,7 +62,7 @@ namespace PPTX
pWriter->WriteLimit2(1, b);
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
pWriter->WriteRecord2(0, FontRef);
pWriter->WriteRecord2(0, fontRef);
pWriter->WriteRecord1(1, Color);
}
......@@ -103,9 +103,9 @@ namespace PPTX
{
case 0:
{
FontRef = new Logic::FontRef();
FontRef->fromPPTY(pReader);
FontRef->m_name = _T("a:fontRef");
fontRef = new Logic::FontRef();
fontRef->fromPPTY(pReader);
fontRef->m_name = _T("a:fontRef");
break;
}
case 1:
......@@ -129,13 +129,13 @@ font (Font)
// fontCollection (. ), Font
//
*/
nullable<FontRef> FontRef;
nullable<FontRef> fontRef;
UniColor Color;
protected:
virtual void FillParentPointersForChilds()
{
if(FontRef.IsInit())
FontRef->SetParentPointer(this);
if(fontRef.IsInit())
fontRef->SetParentPointer(this);
Color.SetParentPointer(this);
}
};
......@@ -147,4 +147,4 @@ font (Font)
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_TCTXSTYLE_INCLUDE_H
\ No newline at end of file
#endif // PPTX_LOGIC_TCTXSTYLE_INCLUDE_H
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