.

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -61,18 +61,21 @@ static void ConvertSvmToImage(std::wstring &file_svm, std::wstring &file_png, CA
 
 static std::wstring get_mime_type(const std::wstring & extension)
 {
-	if (L"eps" == extension)	return  L"image/x-eps";
-	if (L"wmf" == extension)	return  L"image/x-wmf";
-	if (L"emf" == extension)	return  L"image/x-emf";
-  	if (L"gif" == extension)	return  L"image/x-gif";
-   	if (L"png" == extension)	return  L"image/x-png";
- 	if (L"jpg" == extension)	return  L"image/x-jpeg";
-  	if (L"jpeg" == extension)	return  L"image/x-jpeg";
-  	if (L"tiff" == extension)	return  L"image/x-tiff";
-	if (L"pdf" == extension)	return  L"application/pdf";
-	if (L"wav" == extension)	return  L"audio/wav";
-	if (L"bin" == extension)	return  L"application/vnd.openxmlformats-officedocument.oleObject";
-	if (L"xlsx" == extension)	return  L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+		 if (L"eps" == extension)	return  L"image/x-eps";
+	else if (L"wmf" == extension)	return  L"image/x-wmf";
+	else if (L"emf" == extension)	return  L"image/x-emf";
+  	else if (L"gif" == extension)	return  L"image/x-gif";
+   	else if (L"png" == extension)	return  L"image/x-png";
+ 	else if (L"jpg" == extension)	return  L"image/x-jpeg";
+  	else if (L"jpeg" == extension)	return  L"image/x-jpeg";
+   	else if (L"tif" == extension)	return  L"image/x-tiff";
+ 	else if (L"tiff" == extension)	return  L"image/x-tiff";
+	else if (L"pdf" == extension)	return  L"application/pdf";
+	else if (L"wav" == extension)	return  L"audio/wav";
+	else if (L"bin" == extension)	return  L"application/vnd.openxmlformats-officedocument.oleObject";
+	else if (L"xlsx" == extension)	return  L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+	else							return	L"application/octet-stream";
+
 
 	return L"";
 }

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -376,13 +376,14 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
     {//вложеннные элементы ... или после графики embedded_linux_kernel_and_drivers_labs_zh_TW.odt
 		bIsNewParagraph = false;
 		
-		if (!Context.get_paragraph_keep())// например Appendix I_IPP.odt - tracked elements
+		if (!Context.get_paragraph_keep())// например Appendix I_IPP.odt - tracked elements (
 		{
 			for (int i = 0; i < content_.size(); i++)
 			{
 				content_[i]->docx_convert(Context); 
 			}
-			Context.set_paragraph_state(false);
+			if (!Context.get_delete_text_state())
+				Context.set_paragraph_state(false);// например Appendix I_IPP.odt - tracked elements (вложенные списки из 2 элементов)
 			return;
 		}
     }