INTEGRATION: CWS dbwizard1 (1.23.172); FILE MERGED

2004/10/22 12:54:16 tv 1.23.172.3: corrected MIME type in single document check
2004/09/20 12:04:33 tv 1.23.172.2: #i34391# correct path for TypeDetection in the registry
2004/08/19 09:41:36 ih 1.23.172.1: #117590# updated to new file formats

wizards/source/euro/AutoPilotRun.xba

@@ -11,7 +11,7 @@ Public Source as String
 Public SubstFile as String
 Public SubstDir as String
 Public NoArgs()
-Public FilterList(6) as String
+Public FilterList(9) as String
 Public GoOn as Boolean
 Public DoUnprotect as Integer
 Public Password as String
@@ -60,12 +60,15 @@ Dim bDisposable as Boolean
 			FilterList(0) = "application/x-starcalc"
 			FilterList(1) = "application/vnd.stardivision.calc"
 			FilterList(2) = "application/vnd.sun.xml.calc"
+			FilterList(3) = "application/x-vnd.oasis.openoffice.spreadsheet"
 			If DialogModel.chkTextDocuments.State = 1 Then
-				ReDim Preserve FilterList(6) as String
-				FilterList(3) = "application/x-starwriter"
-				FilterList(4) = "application/vnd.stardivision.writer"
-				FilterList(5) = "application/vnd.stardivision.writer/web"
-				FilterList(6) = "application/vnd.sun.xml.writer"
+				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/x-vnd.oasis.openoffice.text"
 			End If
 			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, FilterList())
 			TotDocCount = Ubound(FilesList(),1) + 1
@@ -302,12 +305,12 @@ Dim sNoDirMessage as String
 			If bCheckFileType Then
 				sLocMimeType = GetRealFileContent(oDocInfo, sPath)
 				If DialogModel.chkTextDocuments.State = 1 Then
-					If (Instr(1, sLocMimeType, "writer") = 0) And (Instr(1, sLocMimeType, "calc") = 0) Then
+					If (Instr(1, sLocMimeType, "text") = 0) And (Instr(1, sLocMimeType, "calc") = 0) Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
 						bIsValid = False						
 					End If				
 				Else
-					If Instr(1, sLocMimeType, "calc") = 0 Then
+					If Instr(1, sLocMimeType, "spreadsheet") = 0 Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
 						bIsValid = False
 					End If
@@ -360,21 +363,25 @@ Sub CallFilePicker()
 		Dim oTypes() as Object
 		Dim oUIKey() as Object
 		
-		oMasterKey = GetRegistryKeyContent("org.openoffice.Office.TypeDetection/")
+		oMasterKey = GetRegistryKeyContent("org.openoffice.TypeDetection.Types")
 		oTypes() = oMasterKey.Types
 		oUIKey = GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters")
 		If DialogModel.chkTextDocuments.State = 1 Then
-			Dim FilterNames(7,1) as String
-			FilterNames(4,0) = oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
-			FilterNames(4,1) = "*.sxw"
-			FilterNames(5,0) = oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
-			FilterNames(5,1) = "*.stw"
-			FilterNames(6,0) = oUIKey.Classes.GetByName("sw3to5").DisplayName
-			FilterNames(6,1) = "*.sdw"
-			FilterNames(7,0) = oUIKey.Classes.GetByName("sw3to5templ").DisplayName
-			Filternames(7,1) = "*.vor"
+			Dim FilterNames(11,1) as String
+			FilterNames(6,0) = oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
+			FilterNames(6,1) = "*.sxw"
+			FilterNames(7,0) = oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
+			FilterNames(7,1) = "*.stw"
+			FilterNames(8,0) = oUIKey.Classes.GetByName("sw3to5").DisplayName
+			FilterNames(8,1) = "*.sdw"
+			FilterNames(9,0) = oUIKey.Classes.GetByName("sw3to5templ").DisplayName
+			Filternames(9,1) = "*.vor"
+			FilterNames(10,0) = oTypes.GetByName("writer8").UIName
+			FilterNames(10,1) = "*.oot"
+			FilterNames(11,0) = oTypes.GetByName("writer8_template").UIName
+			FilterNames(11,1) = "*.ott"
 		Else
-			ReDim FilterNames(3,1) as String
+			ReDim FilterNames(5,1) as String
 		End If
 		FilterNames(0,0) = oTypes.GetByName("calc_StarOffice_XML_Calc").UIName	
 		Filternames(0,1) = "*.sxc"
@@ -384,6 +391,10 @@ Sub CallFilePicker()
 		FilterNames(2,1) = "*.sdc"
 		FilterNames(3,0) = oUIKey.Classes.GetByName("sc345templ").DisplayName
 		Filternames(3,1) = "*.vor"
+		FilterNames(4,0) = oTypes.GetByName("calc8").UIName	
+		Filternames(4,1) = "*.oos"
+		FilterNames(5,0) = oTypes.GetByName("calc8_template").UIName	
+		Filternames(5,1) = "*.ots"
 		GetFileName(DialogModel.txtSource, Filternames())
 	Else
 		GetFolderName(DialogModel.txtSource)
@@ -396,4 +407,5 @@ Sub PreviousStep()
 	DialogModel.Step = 2
 	DialogModel.cmdGoOn.Label =  sGOON
 	DialogModel.cmdCancel.Label = sCANCEL
-End Sub</script:module>
\ No newline at end of file
+End Sub
+</script:module>
\ No newline at end of file