..

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,11 +190,11 @@ 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);
 
 				if(lstStyle.IsInit())
@@ -257,6 +248,9 @@ namespace PPTX
 				}
 
 				pReader->Seek(_end_rec);
+
+                if (!bodyPr.IsInit())
+                    bodyPr = new Logic::BodyPr();
             }
 
 			nullable<BodyPr>		bodyPr;
@@ -279,14 +273,6 @@ 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);
 		};