[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 <ha...@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()
 &apos; Applications(X,8) = &quot;File:///...&quot;     (TargetUrl of the 
templates)
 &apos; 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) = &quot;&quot;
 
 &apos; See definition of Filtername-Array about meaning of fields
-       MSFilterName(0,0) = &quot;doc&quot;
-       MSFilterName(0,1) = &quot;writer8&quot;
-       MSFilterName(0,2) = &quot;odt&quot;
+       MSFilterName(0,0) = &quot;doc|docx|docm&quot;
+       MSFilterName(0,1) = &quot;writer8|writer8|writer8&quot;
+       MSFilterName(0,2) = &quot;odt|odt|odt&quot;
        MSFilterName(0,3) = sMSDocumentCheckBox(0)
        MSFilterName(0,4) = &quot;Word&quot;
        
 
-       MSFilterName(1,0) = &quot;xls&quot;
-       MSFilterName(1,1) = &quot;calc8&quot;
-       MSFilterName(1,2) = &quot;ods&quot;
+       MSFilterName(1,0) = &quot;xls|xlsx|xlsm&quot;
+       MSFilterName(1,1) = &quot;calc8|calc8|calc8&quot;
+       MSFilterName(1,2) = &quot;ods|ods|ods&quot;
        MSFilterName(1,3) = sMSDocumentCheckBox(1)
        MSFilterName(1,4) = &quot;Excel&quot;
 
-       MSFilterName(2,0) = &quot;ppt|pps&quot;
-       MSFilterName(2,1) = &quot;impress8|impress8&quot;
-       MSFilterName(2,2) = &quot;odp|odp&quot;
+       MSFilterName(2,0) = &quot;ppt|pps|pptx|pptm&quot;
+       MSFilterName(2,1) = &quot;impress8|impress8|impress8|impress8&quot;
+       MSFilterName(2,2) = &quot;odp|odp|odp|odp&quot;
        MSFilterName(2,3) = sMSDocumentCheckBox(2)
        MSFilterName(2,4) = &quot;PowerPoint&quot;
 
-       MSFilterName(3,0) = &quot;dot&quot;
-       MSFilterName(3,1) = &quot;writer8_template&quot;
-       MSFilterName(3,2) = &quot;ott&quot;
+       MSFilterName(3,0) = &quot;dot|dotx|dotm&quot;
+       MSFilterName(3,1) = 
&quot;writer8_template|writer8_template|writer8_template&quot;
+       MSFilterName(3,2) = &quot;ott|ott|ott&quot;
        MSFilterName(3,3) = sMSTemplateCheckBox(0)
        MSFilterName(3,4) = &quot;Word&quot;    
        
-       MSFilterName(4,0) = &quot;xlt&quot;
-       MSFilterName(4,1) = &quot;calc8_template&quot;
-       MSFilterName(4,2) = &quot;ots&quot;
+       MSFilterName(4,0) = &quot;xlt|xltx|xltm&quot;
+       MSFilterName(4,1) = 
&quot;calc8_template|calc8_template|calc8_template&quot;
+       MSFilterName(4,2) = &quot;ots|ots|ots&quot;
        MSFilterName(4,3) = sMSTemplateCheckBox(1)
        MSFilterName(4,4) = &quot;Excel&quot;   
 
-       MSFilterName(5,0) = &quot;pot&quot;
-       MSFilterName(5,1) = &quot;impress8_template&quot;
-       MSFilterName(5,2) = &quot;otp&quot;
+       MSFilterName(5,0) = &quot;pot|potx|potm&quot;
+       MSFilterName(5,1) = 
&quot;impress8_template|impress8_template|impress8_template&quot;
+       MSFilterName(5,2) = &quot;otp|otp|otp&quot;
        MSFilterName(5,3) = sMSTemplateCheckBox(2)
        MSFilterName(5,4) = &quot;PowerPoint&quot;      
 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 &quot;sdw&quot;, &quot;sdc&quot;, &quot;sda&quot;, 
&quot;sdd&quot;, &quot;smf&quot;, &quot;sgl&quot;, &quot;doc&quot;, 
&quot;xls&quot;, &quot;ppt&quot;, &quot;sxi&quot; , &quot;sxw&quot; , 
&quot;sxd&quot; , &quot;sxg&quot; , &quot;sxm&quot; , &quot;sxc&quot; , 
&quot;pps&quot;
+                       Case &quot;sdw&quot;, &quot;sdc&quot;, &quot;sda&quot;, 
&quot;sdd&quot;, &quot;smf&quot;, &quot;sgl&quot;, &quot;doc&quot;, 
&quot;xls&quot;, &quot;ppt&quot;, &quot;sxi&quot; , &quot;sxw&quot; , 
&quot;sxd&quot; , &quot;sxg&quot; , &quot;sxm&quot; , &quot;sxc&quot; , 
&quot;pps&quot; , &quot;docx&quot; , &quot;docm&quot; , &quot;xlsx&quot; , 
&quot;xlsm&quot; , &quot;xlsb&quot; , &quot;pptx&quot; , &quot;pptm&quot;
                                AbsDocuFound = AbsDocuFound + 1
                        Case else
                                AbsTemplateFound = AbsTemplateFound + 1
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits