[Libreoffice-commits] core.git: wizards/source

[Julien Nabet]

 wizards/source/importwizard/DialogModul.xba |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b10e69287c42db61679d70146ed5e7c54ee1863e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed May 1 23:28:37 2013 +0200

    fdo#60265 Really fixes Basic problem
    
    GetFilterName function in FilesModul.xba needs the extension be repeated too
    sLocExtensionList() = ArrayoutofString(sFilterName(i,2), "|", MaxIndex)
    
    Change-Id: I2fecd5352345e6b7541d0a961012c7e91046fb0d
    Reviewed-on: https://gerrit.libreoffice.org/3729
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 92ca877..c5210ce 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -333,38 +333,38 @@ Sub	SetupMSConfiguration()
 ' See definition of Filtername-Array about meaning of fields
 	MSFilterName(0,0) = "doc|docx|docm"
 	MSFilterName(0,1) = "writer8|writer8|writer8"
-	MSFilterName(0,2) = "odt"
+	MSFilterName(0,2) = "odt|odt|odt"
 	MSFilterName(0,3) = sMSDocumentCheckBox(0)
 	MSFilterName(0,4) = "Word"
 	
 
 	MSFilterName(1,0) = "xls|xlsx|xlsm"
 	MSFilterName(1,1) = "calc8|calc8|calc8"
-	MSFilterName(1,2) = "ods"
+	MSFilterName(1,2) = "ods|ods|ods"
 	MSFilterName(1,3) = sMSDocumentCheckBox(1)
 	MSFilterName(1,4) = "Excel"
 
-	MSFilterName(2,0) = "ppt|pptm|pptx"
-	MSFilterName(2,1) = "impress8|impress8|impress8"
-	MSFilterName(2,2) = "odp"
+	MSFilterName(2,0) = "ppt|pps|pptx|pptm|ppsx|ppsm"
+	MSFilterName(2,1) = "impress8|impress8|impress8|impress8|impress8|impress8"
+	MSFilterName(2,2) = "odp|odp|odp|odp|odp|odp"
 	MSFilterName(2,3) = sMSDocumentCheckBox(2)
 	MSFilterName(2,4) = "PowerPoint"
 
 	MSFilterName(3,0) = "dot|dotx|dotm"
 	MSFilterName(3,1) = "writer8_template|writer8_template|writer8_template"
-	MSFilterName(3,2) = "ott"
+	MSFilterName(3,2) = "ott|ott|ott"
 	MSFilterName(3,3) = sMSTemplateCheckBox(0)
 	MSFilterName(3,4) = "Word"	
 	
 	MSFilterName(4,0) = "xlt|xltx|xltm"
 	MSFilterName(4,1) = "calc8_template|calc8_template|calc8_template"
-	MSFilterName(4,2) = "ots"
+	MSFilterName(4,2) = "ots|ots|ots"
 	MSFilterName(4,3) = sMSTemplateCheckBox(1)
 	MSFilterName(4,4) = "Excel"	
 
 	MSFilterName(5,0) = "pot|potx|potm"
 	MSFilterName(5,1) = "impress8_template|impress8_template|impress8_template"
-	MSFilterName(5,2) = "otp"
+	MSFilterName(5,2) = "otp|otp|otp"
 	MSFilterName(5,3) = sMSTemplateCheckBox(2)
 	MSFilterName(5,4) = "PowerPoint"	
 End Sub