.

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -2218,7 +2218,7 @@ void odf_drawing_context::set_text(odf_text_context* text_context)
 {
 	if (text_context == NULL || impl_->current_level_.size() < 1 ) return;
 	
-	if (impl_->is_presentation_ && *impl_->is_presentation_) return; 
+	//if (impl_->is_presentation_ && *impl_->is_presentation_) return; 
 
 	for (size_t i = 0; i < text_context->text_elements_list_.size(); i++)
 	{

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -1059,9 +1059,9 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
 
 	int			 list_level		= 0;
 
-	if (oox_paragraph->pPr.IsInit())
+	if (oox_paragraph->pPr.IsInit() || oox_list_style)
 	{
-		if (oox_paragraph->pPr->lvl.IsInit() || oox_paragraph->pPr->ParagraphBullet.is_init())
+		if (oox_paragraph->pPr.IsInit() && (oox_paragraph->pPr->lvl.IsInit() || oox_paragraph->pPr->ParagraphBullet.is_init()))
 		{
 			list_present = true;
 		
@@ -1135,10 +1135,10 @@ void OoxConverter::convert(PPTX::Logic::TextListStyle *oox_list_style, int level
 	if (!oox_list_style)		return;
 	if (!paragraph_properties)	return;
 
+	convert(oox_list_style->levels[9].GetPointer(), paragraph_properties);
 	if (level < 0 || level > 9) return;
 
 	convert(oox_list_style->levels[level].GetPointer(), paragraph_properties);
-	
 }
 void OoxConverter::convert(PPTX::Logic::TextParagraphPr *oox_paragraph_pr, odf_writer::style_paragraph_properties * paragraph_properties)
 {

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -327,7 +327,7 @@ void PptxConverter::convert_slides()
 					if (slide->Layout->clrMapOvr.IsInit() && slide->Layout->clrMapOvr->overrideClrMapping.IsInit())
 						current_clrMap	= slide->Layout->clrMapOvr->overrideClrMapping.GetPointer();
 					current_slide = slide->Layout.operator->();
-					convert_slide(&slide->Layout->cSld, false);		
+					convert_slide(&slide->Layout->cSld, true);		
 				odp_context->end_master_slide();
 				
 				m_mapMasters.insert(std::make_pair(slide->Master->m_sOutputFilename + slide->Layout->m_sOutputFilename, master_style_name));
@@ -899,20 +899,21 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, bool bPlaceholde
 		
 		if (pShape.IsInit() && pShape->nvSpPr.nvPr.ph.is_init())
 		{
-			pShape->FillLevelUp();
 			if (bPlaceholders)
 			{
+				pShape->FillLevelUp();
 				PPTX::Logic::Shape update_shape;
 				
-				pShape->levelUp->Merge(update_shape, true);
+				if (pShape->levelUp)
+					pShape->levelUp->Merge(update_shape, true);
 				pShape->Merge(update_shape);
 
 				OoxConverter::convert(&update_shape);
 			}
-			else
-			{
-				OoxConverter::convert(pShape.operator->());
-			}
+			//else
+			//{
+			//	OoxConverter::convert(pShape.operator->());
+			//}
 		}
 		else 
 		{