incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1182521 - /incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba
Date Wed, 12 Oct 2011 18:47:16 GMT
Author: pfg
Date: Wed Oct 12 18:47:16 2011
New Revision: 1182521

URL: http://svn.apache.org/viewvc?rev=1182521&view=rev
Log:
i100686 - wizards: Euro converter wizard don't work when searching for calc documents in a
dir

Modified:
    incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba

Modified: incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba?rev=1182521&r1=1182520&r2=1182521&view=diff
==============================================================================
--- incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba (original)
+++ incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba Wed Oct 12 18:47:16 2011
@@ -11,7 +11,7 @@ Public Source as String
 Public SubstFile as String
 Public SubstDir as String
 Public NoArgs()
-Public FilterList(9) as String
+Public TypeList(14) as String
 Public GoOn as Boolean
 Public DoUnprotect as Integer
 Public Password as String
@@ -55,20 +55,25 @@ Dim bDisposable as Boolean
 		Else
 			SourceDir = Source
 			TargetStemDir = TargetDir
-			FilterList(0) = "application/x-starcalc"
-			FilterList(1) = "application/vnd.stardivision.calc"
-			FilterList(2) = "application/vnd.sun.xml.calc"
-			FilterList(3) = "application/vnd.oasis.opendocument.spreadsheet"
+			TypeList(0) = "calc8"
+			TypeList(1) = "calc_StarOffice_XML_Calc"
+			TypeList(2) = "calc_StarCalc_30"
+			TypeList(3) = "calc_StarCalc_40"
+			TypeList(4) = "calc_StarCalc_50"
 			If DialogModel.chkTextDocuments.State = 1 Then
-				ReDim Preserve FilterList(8) as String
-				
-				FilterList(4) = "application/x-starwriter"
-				FilterList(5) = "application/vnd.stardivision.writer"
-				FilterList(6) = "application/vnd.stardivision.writer/web"
-				FilterList(7) = "application/vnd.sun.xml.writer"
-				FilterList(8) = "application/vnd.oasis.opendocument.text"
+				ReDim Preserve TypeList(13) as String
+
+				TypeList(5) = "writer8"
+				TypeList(6) = "writerglobal8"
+				TypeList(7) = "writer_StarOffice_XML_Writer"
+				TypeList(8) = "writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
+				TypeList(9) = "writer_StarWriter_30"
+				TypeList(10) = "writer_StarWriter_40"
+				TypeList(11) = "writer_globaldocument_StarWriter_40GlobalDocument"
+				TypeList(12) = "writer_StarWriter_50"
+				TypeList(13) = "writer_globaldocument_StarWriter_50GlobalDocument"
 			End If
-			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, FilterList())
+			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, TypeList())
 			TotDocCount = Ubound(FilesList(),1) + 1
 		End If
 		InitializeProgressPage(DialogModel)



Mime
View raw message