fix for ms office editor. bug 36869.

ASCOfficeOdfFileW/source/OdfFormat/odp_conversion_context.cpp

@@ -90,6 +90,11 @@ void odp_conversion_context::end_document()
 {
 	odf_conversion_context::end_document();
 }
+
+size_t odp_conversion_context::get_pages_count()
+{
+	return root_presentation_->pages_.size();
+}
 void odp_conversion_context::start_slide()
 {
 	slide_context_.set_styles_context(styles_context());

ASCOfficeOdfFileW/source/OdfFormat/odp_conversion_context.h

@@ -52,6 +52,8 @@ public:
 	void start_slide();
 	void end_slide();
 
+	size_t get_pages_count();
+
 	void start_master_slide(std::wstring name);
 	void end_master_slide();
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -1329,8 +1329,17 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
 	if (current_theme && current_clrMap)
 		current_theme->SetColorMap(*current_clrMap);
 
+	std::wstring page_name;
 	if (oox_slide->attrName.IsInit())
-		odp_context->current_slide().set_page_name(oox_slide->attrName.get());
+		page_name = oox_slide->attrName.get();
+	
+
+	if (page_name.empty())
+	{
+		if (type == Slide)
+			page_name = L"Slide_" + std::to_wstring(odp_context->get_pages_count());
+	}
+	odp_context->current_slide().set_page_name(page_name);
 
 	if (type != Notes && type != NotesMaster)
 	{

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -120,7 +120,7 @@ namespace PPTX
 			std::wstring strName		= XmlUtils::GetNameNoNS(oReader.GetName());
 			std::wstring strNamespace	= XmlUtils::GetNamespace(oReader.GetName());
 			
-			if (L"xfrm" == strName && strNamespace != L"xdr")
+			if (L"xfrm" == strName)
 				xfrm = oReader;
 			else if (L"cNvGraphicFramePr" == strName)
 				nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader );
@@ -320,7 +320,7 @@ namespace PPTX
 					std::wstring strName		= XmlUtils::GetNameNoNS(oNode.GetName());
 					std::wstring strNamespace	= XmlUtils::GetNamespace(oNode.GetName());
 
-					if (L"xfrm" == strName && strNamespace != L"xdr")
+					if (L"xfrm" == strName)
 						xfrm = oNode;
 					else if (L"nvGraphicFramePr" == strName)
 						nvGraphicFramePr = oNode;

DesktopEditor/AllFontsGen/main.cpp

@@ -616,12 +616,25 @@ namespace NSCommon
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Courier New", 15));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Carlito", 16));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Segoe UI", 17));
-                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Gothic", 18));
-                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimSun", 19));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimSun", 18));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Gothic", 19));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Nirmala UI", 20));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Batang", 21));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Mincho", 22));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Wingdings", 23));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei", 24));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei UI", 25));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft YaHei", 26));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PMingLiU", 27));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MingLiU", 28));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"DFKai-SB", 29));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"FangSong", 30));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"KaiTi", 31));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimKai", 32));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimHei", 33));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Meiryo", 34));
+
+
 
                 CApplicationFontsSymbols oApplicationChecker;
 

DesktopEditor/fontengine/application_generate_fonts.h

@@ -710,11 +710,23 @@ namespace NSCommon
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Courier New", 15));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Carlito", 16));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Segoe UI", 17));
-                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Gothic", 18));
-                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimSun", 19));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimSun", 18));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Gothic", 19));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Nirmala UI", 20));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Batang", 21));
                 mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Mincho", 22));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Wingdings", 23));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei", 24));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei UI", 25));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft YaHei", 26));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PMingLiU", 27));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MingLiU", 28));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"DFKai-SB", 29));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"FangSong", 30));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"KaiTi", 31));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimKai", 32));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimHei", 33));
+                mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Meiryo", 34));
 
                 CApplicationFontsSymbols oApplicationChecker;