numeric format '#','?' accepts, '$' fixes.

mk-j · Jul 2, 2018 · 164dbde · 164dbde
1 parent c4ba602
commit 164dbde
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/xlsxwriter.class.php b/xlsxwriter.class.php
@@ -778,9 +778,9 @@ private static function determineNumberFormatType($num_format)
 		if (preg_match("/[Y]{2,4}/i", $num_format)) return 'n_date';
 		if (preg_match("/[D]{1,2}/i", $num_format)) return 'n_date';
 		if (preg_match("/[M]{1,2}/i", $num_format)) return 'n_date';
-		if (preg_match("/$/", $num_format)) return 'n_numeric';
-		if (preg_match("/%/", $num_format)) return 'n_numeric';
-		if (preg_match("/0/", $num_format)) return 'n_numeric';
+		if (preg_match('/\$/', $num_format)) return 'n_numeric';
+		if (preg_match('/%/', $num_format)) return 'n_numeric';
+		if (preg_match('/[0#?]/', $num_format)) return 'n_numeric';
 		return 'n_auto';
 	}
 	//------------------------------------------------------------------