pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
ElenaSubbotina
2017-03-03 13:35:37 +03:00
parent 2dc5c2916a
commit 80d4e6057b
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h
View File

@ -129,9 +129,6 @@ namespace PPTX
}
virtual std::wstring toXML() const
{
if (!bodyPr.IsInit())
bodyPr = new Logic::BodyPr();
XmlUtils::CNodeValue oValue;
oValue.WriteNullable(bodyPr);
@ -143,9 +140,6 @@ namespace PPTX
virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
{
if (!bodyPr.IsInit())
bodyPr = new Logic::BodyPr();
pWriter->StartNode(m_name);
pWriter->EndAttributes();
@ -167,9 +161,6 @@ namespace PPTX
void toXmlWriterExcel(NSBinPptxRW::CXmlWriter* pWriter) const
{
if (!bodyPr.IsInit())
bodyPr = new Logic::BodyPr();
if (bodyPr.IsInit())
{
bodyPr->m_namespace = _T("a");
@ -199,12 +190,12 @@ namespace PPTX
return result;
}
void Merge(nullable<TxBody>& txBody)const
void Merge(nullable<TxBody>& txBody)
{
if(!txBody.is_init()) return;
if (!bodyPr.IsInit())
bodyPr = new Logic::BodyPr();
if(bodyPr.IsInit())
bodyPr->Merge(txBody->bodyPr);
bodyPr->Merge(txBody->bodyPr);
if(lstStyle.IsInit())
lstStyle->Merge(txBody->lstStyle);
@ -257,7 +248,10 @@ namespace PPTX
}
pReader->Seek(_end_rec);
}
if (!bodyPr.IsInit())
bodyPr = new Logic::BodyPr();
}
nullable<BodyPr> bodyPr;
nullable<TextListStyle> lstStyle;
@ -279,18 +273,10 @@ namespace PPTX
}
public:
bool IsOneLineParagraphs() const
{
if (!bodyPr.is_init()) return false;
if (!bodyPr->wrap.is_init()) return false;
return (bodyPr->wrap->get() == _T("none"));
}
std::wstring GetDocxTxBoxContent(NSBinPptxRW::CBinaryFileWriter* pWriter, const nullable<PPTX::Logic::ShapeStyle>& shape_style);
};
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_TXBODY_INCLUDE_H
#endif // PPTX_LOGIC_TXBODY_INCLUDE_H