INTEGRATION: CWS nativefixer7 (1.43.22); FILE MERGED

2005/05/09 12:01:48 ih 1.43.22.1: write into logfile only if this file exists

wizards/source/importwizard/FilesModul.xba

@@ -437,7 +437,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" 
+			Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "xls", "ppt", "sxi" , "sxw" , "sxd" , "sxg" , "sxm" , "sxc" , "pps"
 				AbsDocuFound = AbsDocuFound + 1
 			Case else
 				AbsTemplateFound = AbsTemplateFound + 1
@@ -517,6 +517,9 @@ Dim FilterIndex as Integer
 Dim sDocumentType as String
 Dim oTextCursor
 Dim oCell
+	If Not bLogExists Then
+        Exit Sub
+    End If 
 	bFilterTracerIsinsideTable = False
 	FilterIndex = GetIndexForPartStringinMultiArray(sFilterName(), CurFileContent, 0)
 	sDocumentType = sFiltername(FilterIndex,3)
@@ -609,14 +612,14 @@ Dim bLogIsThere as Boolean
 		OpenProperties(0).Name = "Hidden"
 		OpenProperties(0).Value = True
 		oLogDocument = StarDesktop.LoadComponentFromURL("private:factory/swriter", "_default", 4, OpenProperties())
-		sLogUrl = SOWorkPath & "/Logfile.sxw"
+		sLogUrl = SOWorkPath & "/Logfile.odt"
 		Do
 			bLogIsThere = oUcb.Exists(sLogUrl)
 			If bLogIsThere Then
 				If i = 2 Then
-					sLogUrl = ReplaceString(sLogUrl, "/Logfile_2.sxw", "/Logfile.sxw")
+					sLogUrl = ReplaceString(sLogUrl, "/Logfile_2.odt", "/Logfile.odt")
 				Else
-					sLogUrl = ReplaceString(sLogUrl, "/Logfile_" & cStr(i) & ".sxw", "/Logfile_" & cStr(i-1) & ".sxw")
+					sLogUrl = ReplaceString(sLogUrl, "/Logfile_" & cStr(i) & ".odt", "/Logfile_" & cStr(i-1) & ".odt")
 				End If
 				i = i + 1
 			End If