.

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -867,11 +867,7 @@ void docx_conversion_context::docx_serialize_paragraph_style(std::wostream & str
 				CP_XML_STREAM() << paragraph_style.str();
 				docx_serialize_list_properties(CP_XML_STREAM());
 				
-				if (!get_text_tracked_context().dumpPPr_.empty())
-				{
-					CP_XML_STREAM() << get_text_tracked_context().dumpPPr_;
-					get_text_tracked_context().dumpPPr_.clear();
-				}
+
 				if ((run_style.tellp() > 0 && in_styles == false) || !get_text_tracked_context().dumpRPrInsDel_.empty())
 				{
 					CP_XML_NODE(L"w:rPr")
@@ -883,6 +879,11 @@ void docx_conversion_context::docx_serialize_paragraph_style(std::wostream & str
 					}
 					get_text_tracked_context().dumpRPrInsDel_.clear();
 				}
+				if (!get_text_tracked_context().dumpPPr_.empty())
+				{
+					CP_XML_STREAM() << get_text_tracked_context().dumpPPr_;
+					get_text_tracked_context().dumpPPr_.clear();
+				}
 			}
 		}
     }

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -1090,10 +1090,10 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty	*oox_paragraph_pr, cp
 		{
 			if (rule == SimpleTypes::linespacingruleExact)
 			{
-				_CP_OPT(odf_types::length) length;
+				_CP_OPT(odf_types::length) length_;
 				
-				convert(static_cast<SimpleTypes::CUniversalMeasure *>(oox_paragraph_pr->m_oSpacing->m_oLine.GetPointer()), length);
-				paragraph_properties->content().fo_line_height_ = odf_types::line_width(length);
+				convert(static_cast<SimpleTypes::CUniversalMeasure *>(oox_paragraph_pr->m_oSpacing->m_oLine.GetPointer()), length_);
+				paragraph_properties->content().fo_line_height_ = odf_types::line_width(*length_);
 			}
 			else
 			{