Author: hanya
Date: Sat Jan 18 13:21:35 2014
New Revision: 1559342
URL: http://svn.apache.org/r1559342
Log:
#i95102# support Office 2007 file extensions on the Document Converter
Modified:
openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba
openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba
Modified: openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba?rev=1559342&r1=1559341&r2=1559342&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba (original)
+++ openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba Sat Jan
18 13:21:35 2014
@@ -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
Modified: openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba?rev=1559342&r1=1559341&r2=1559342&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba (original)
+++ openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba Sat Jan 18
13:21:35 2014
@@ -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
