diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h index c34cb22f20..bb5f66cca9 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h @@ -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)const + void Merge(nullable& 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; nullable 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& shape_style); }; } // namespace Logic } // namespace PPTX -#endif // PPTX_LOGIC_TXBODY_INCLUDE_H \ No newline at end of file +#endif // PPTX_LOGIC_TXBODY_INCLUDE_H