[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/source

[Tsutomu Uchino]

 wizards/source/importwizard/DialogModul.xba |   38 ++++++++++++++--------------
 wizards/source/importwizard/FilesModul.xba  |    2 -
 2 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 264a2a318aa9e26eb37b07d6676f96045e88ea3d
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Sat Jan 18 13:21:35 2014 +0000

    #i95102# support Office 2007 file extensions on the Document Converter

diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index a83733c..23bf20d 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -89,7 +89,7 @@ Public XMLTemplateList()
 ' Applications(X,8) = "File:///..." 	(TargetUrl of the templates)
 ' Applications(X,9) = 0				    (Key to the original Index of the Applications)
 
-Public Const SBMAXEXTENSIONLENGTH = 15
+Public Const SBMAXEXTENSIONLENGTH = 17
 
 
 Sub FillStep_Welcome()
@@ -412,40 +412,40 @@ Sub	SetupMSConfiguration()
 	sValueName(2) = ""
 
 ' See definition of Filtername-Array about meaning of fields
-	MSFilterName(0,0) = "doc"
-	MSFilterName(0,1) = "writer8"
-	MSFilterName(0,2) = "odt"
+	MSFilterName(0,0) = "doc|docx|docm"
+	MSFilterName(0,1) = "writer8|writer8|writer8"
+	MSFilterName(0,2) = "odt|odt|odt"
 	MSFilterName(0,3) = sMSDocumentCheckBox(0)
 	MSFilterName(0,4) = "Word"
 	
 
-	MSFilterName(1,0) = "xls"
-	MSFilterName(1,1) = "calc8"
-	MSFilterName(1,2) = "ods"
+	MSFilterName(1,0) = "xls|xlsx|xlsm"
+	MSFilterName(1,1) = "calc8|calc8|calc8"
+	MSFilterName(1,2) = "ods|ods|ods"
 	MSFilterName(1,3) = sMSDocumentCheckBox(1)
 	MSFilterName(1,4) = "Excel"
 
-	MSFilterName(2,0) = "ppt|pps"
-	MSFilterName(2,1) = "impress8|impress8"
-	MSFilterName(2,2) = "odp|odp"
+	MSFilterName(2,0) = "ppt|pps|pptx|pptm"
+	MSFilterName(2,1) = "impress8|impress8|impress8|impress8"
+	MSFilterName(2,2) = "odp|odp|odp|odp"
 	MSFilterName(2,3) = sMSDocumentCheckBox(2)
 	MSFilterName(2,4) = "PowerPoint"
 
-	MSFilterName(3,0) = "dot"
-	MSFilterName(3,1) = "writer8_template"
-	MSFilterName(3,2) = "ott"
+	MSFilterName(3,0) = "dot|dotx|dotm"
+	MSFilterName(3,1) = "writer8_template|writer8_template|writer8_template"
+	MSFilterName(3,2) = "ott|ott|ott"
 	MSFilterName(3,3) = sMSTemplateCheckBox(0)
 	MSFilterName(3,4) = "Word"	
 	
-	MSFilterName(4,0) = "xlt"
-	MSFilterName(4,1) = "calc8_template"
-	MSFilterName(4,2) = "ots"
+	MSFilterName(4,0) = "xlt|xltx|xltm"
+	MSFilterName(4,1) = "calc8_template|calc8_template|calc8_template"
+	MSFilterName(4,2) = "ots|ots|ots"
 	MSFilterName(4,3) = sMSTemplateCheckBox(1)
 	MSFilterName(4,4) = "Excel"	
 
-	MSFilterName(5,0) = "pot"
-	MSFilterName(5,1) = "impress8_template"
-	MSFilterName(5,2) = "otp"
+	MSFilterName(5,0) = "pot|potx|potm"
+	MSFilterName(5,1) = "impress8_template|impress8_template|impress8_template"
+	MSFilterName(5,2) = "otp|otp|otp"
 	MSFilterName(5,3) = sMSTemplateCheckBox(2)
 	MSFilterName(5,4) = "PowerPoint"	
 End Sub
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index 27834e7..eaf92bb 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -456,7 +456,7 @@ Dim s as Integer
 		FirstList(i,1) = SecList(s,1)
 		sLocExtension = lcase(FirstList(i,1))
 		Select Case sLocExtension
-			Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "xls", "ppt", "sxi" , "sxw" , "sxd" , "sxg" , "sxm" , "sxc" , "pps"
+			Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "xls", "ppt", "sxi" , "sxw" , "sxd" , "sxg" , "sxm" , "sxc" , "pps" , "docx" , "docm" , "xlsx" , "xlsm" , "xlsb" , "pptx" , "pptm"
 				AbsDocuFound = AbsDocuFound + 1
 			Case else
 				AbsTemplateFound = AbsTemplateFound + 1