Fix slideMasterContent and font size

tornadory · Nov 17, 2015 · e612063 · e612063
1 parent b77b35a
commit e612063
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/js/worker.js b/js/worker.js
@@ -177,7 +177,7 @@ function processSingleSlide(zip, sldFileName, index, slideSize) {
 	}
 	// Open slideMasterXX.xml
 	var slideMasterContent = readXmlFile(zip, masterFilename);
-	var slideMasterTextStyles = slideMasterContent["p:txStyles"];
+	var slideMasterTextStyles = getTextByPathList(slideMasterContent, ["p:sldMaster", "p:txStyles"]);
 	var slideMasterTables = indexNodes(slideMasterContent);
 	//debug(slideMasterTables);
 
@@ -1046,19 +1046,19 @@ function getFontSize(node, slideLayoutSpNode, slideMasterSpNode, type, slideMast
 	if ((isNaN(fontSize) || fontSize === undefined)) {
 		var sz = getTextByPathList(slideLayoutSpNode, ["p:txBody", "a:lstStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]);
 		fontSize = parseInt(sz) / 100;
-	}	
-	/*
-	if ((isNaN(fontSize) || fontSize === undefined) && slideLayoutSpNode !== undefined && slideLayoutSpNode["a:defRPr"] !== undefined) {
-		fontSize = parseInt(slideLayoutSpNode["a:defRPr"]["attrs"]["sz"]) / 100;
 	}
-	*/
 
-	if (isNaN(fontSize)) {
+	if (isNaN(fontSize) || fontSize === undefined) {
 		if (type == "title" || type == "subTitle" || type == "ctrTitle") {
-			fontSize = parseInt(getTextByPathList(slideMasterTextStyles, ["p:titleStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]));
+			var sz = getTextByPathList(slideMasterTextStyles, ["p:titleStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]);
+		} else if (type == "body") {
+			var sz = getTextByPathList(slideMasterTextStyles, ["p:bodyStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]);
+		} else if (type == "dt" || type == "sldNum") {
+			var sz = "1200";
 		} else if (type === undefined) {
-			fontSize = parseInt(getTextByPathList(slideMasterTextStyles, ["p:otherStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]));;
+			var sz = getTextByPathList(slideMasterTextStyles, ["p:otherStyle", "a:lvl1pPr", "a:defRPr", "attrs", "sz"]);
 		}
+		fontSize = parseInt(sz) / 100;
 	}
 
 	var baseline = getTextByPathList(node, ["a:rPr", "attrs", "baseline"]);