From 49c1230b59a3e9c5686510c1e0015e55c7a3831d Mon Sep 17 00:00:00 2001
From: Behrend Cornelius <bc@openoffice.org>
Date: Wed, 8 Aug 2001 14:41:53 +0000
Subject: #90700# filter for PP now added

---
 wizards/source/importwizard/DialogModul.xba  | 2 +-
 wizards/source/importwizard/FilesModul.xba   | 6 ++++--
 wizards/source/importwizard/ImportDialog.xdl | 4 ++--
 wizards/source/importwizard/Main.xba         | 8 +-------
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'wizards')

diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 4994c9596214..43c115d0212f 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -357,7 +357,7 @@ Sub	SetupMSConfiguration()
 	MSFilterName(1,1) = &quot;scalc: StarOffice XML (Calc)&quot;
 	MSFilterName(1,2) = &quot;sxc&quot;
 
-	MSFilterName(2,0) = &quot;pod&quot;
+	MSFilterName(2,0) = &quot;ppt&quot;
 	MSFilterName(2,1) = &quot;simpress: StarOffice XML (Impress)&quot;
 	MSFilterName(2,2) = &quot;sxi&quot;
 
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index 6c76af476fbe..739fcf6d9541 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -205,8 +205,10 @@ Dim MaxFileIndex as Integer
 	ImportDialog.cbGoOn.Label = sReady
 	ImportDialog.cbGoOn.Enabled = True
 	bCallCancelMsg = False
-
-	oLogDocument.Dispose()
+&apos;Todo: Natürlich nur schließen, wenn auch vorhanden!
+	If Not IsNull(oLogDocument) Then
+		oLogDocument.Dispose()
+	End If
 	ImportDialogArea.endExecute
 	ImportDialogArea.Dispose	
 	End
diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl
index 912a593ca3d0..5e265290f898 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -31,8 +31,8 @@
   <dlg:button dlg:id="cbCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34572" dlg:value="cbCancel">
    <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.CancelButton"/>
   </dlg:button>
-  <dlg:button dlg:id="cbHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34571" dlg:value="cbHelp">
-   <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.HelperDialog"/>
+  <dlg:button dlg:id="cbHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="34571" dlg:help-url="HID:34571" dlg:value="cbHelp">
+   <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Tools.Recursive.ShowHelperDialog"/>
   </dlg:button>
   <dlg:button dlg:id="cbGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34574" dlg:value="cbGoOn">
    <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.NextStep"/>
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index b9a3af29ec39..9065cd3a5a3c 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -37,7 +37,7 @@ Sub Main()
 	FillStep_Welcome()
 	RepaintHeaderPreview()
 	SetStates()
-	ImportDialogArea.Execute() &apos;Visible = True 
+	ImportDialogArea.Visible = True 
 	ImportDialog.cbGoOn.DefaultButton = True
 	Exit Sub
 RTError:
@@ -172,12 +172,6 @@ Dim sBitmapPath as String
 End Sub
 
 
-Sub HelperDialog()
-&apos;Todo: The String &quot;start&quot; can be replaced by a HelpIndex
-	StarDesktop.LoadComponentfromUrl(&quot;vnd.sun.star.help://&quot; &amp; sDocType &amp; &quot;/start&quot;, &quot;_OFFICE_HELP&quot;, 64, NoArgs())
-End Sub
-
-
 Sub ToggleCheckboxes(oEvent as Object)
 Dim bMSEnable as Boolean
 	bMSEnable = oEvent.Source.Model.Tag = &quot;MS&quot;
-- 
cgit v1.2.3