From fefa3b69e6abd22a65c3ff4cf4db40050eb1d894 Mon Sep 17 00:00:00 2001
From: Behrend Cornelius <bc@openoffice.org>
Date: Fri, 8 Nov 2002 12:55:35 +0000
Subject: #104755# Now "DisposeDocument" called instead of
 "oBasedocument.dispose()"

---
 wizards/source/webwizard/HtmlAutoPilotBasic.xba | 12 ++++------
 wizards/source/webwizard/Language.xba           | 30 ++++++++++++-------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
index d7882bff25a3..9063117b9b16 100644
--- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba
+++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
@@ -61,15 +61,11 @@ On Local Error Goto GlobalErrorHandler
 	oBaseDocument.LockControllers
 	oViewSettings.ShowTableBoundaries = False
 	If Not GetWebWizardPaths() Then
-		oBaseDocument.dispose()
+		DisposeDocument(oBaseDocument)
 		Exit Sub
 	End If
 	LoadLanguage
 	SetProgressValue(10)
-	If Not GetWebWizardPaths() Then
-		oBaseDocument.dispose()
-		Exit Sub
-	End If
 	Layout() = getListBoxArrays(oUcb, &quot;/cnt&quot;)
 	GetCurIndex(DialogModel, Layout(),2)
 	SetProgressValue(30)
@@ -88,7 +84,7 @@ On Local Error Goto GlobalErrorHandler
 	Select Case RetValue
 		Case 0
 			MainDialog.Dispose()
-			oBaseDocument.Dispose()
+			DisposeDocument(oBaseDocument)
 		Case 1
 			EndDialog()
 			MainDialog.Dispose()
@@ -96,7 +92,7 @@ On Local Error Goto GlobalErrorHandler
 GLOBALERRORHANDLER:
 	If Err &lt;&gt; 0 Then
 		MsgBox (WebWiz_gErrMsg$, 16, WebWiz_gWizardName$)
-		oBaseDocument.dispose()
+		DisposeDocument(oBaseDocument)
 		RESUME EXITWIZARD
 EXITWIZARD:
 	End If
@@ -369,7 +365,7 @@ Dim sExtension as String
 	End If
 	If Not bItemfound Then
 		MsgBox(WebWiz_gErrContentNotFound$, 16, WebWiz_gWizardName$)
-		oBaseDocument.Dispose()
+		DisposeDocument(oBaseDocument)
 		Stop
 	End If
 	getListBoxArrays = List()
diff --git a/wizards/source/webwizard/Language.xba b/wizards/source/webwizard/Language.xba
index c1d5eadee5a0..f91ed9bbce9e 100644
--- a/wizards/source/webwizard/Language.xba
+++ b/wizards/source/webwizard/Language.xba
@@ -21,28 +21,26 @@ End Sub
 Function GetWebWizardPaths() as Boolean
 Dim TemplatePath as String
 	TextureDir = GetOfficeSubPath(&quot;Gallery&quot;,&quot;www-back&quot;)
-		If TextureDir &lt;&gt; &quot;&quot; Then
-			GraphicsDir = GetOfficeSubPath(&quot;Gallery&quot;,&quot;www-graf/&quot;)
-			If GraphicsDir &lt;&gt; &quot;&quot; Then
-				BulletDir = GetOfficeSubPath(&quot;Gallery&quot;, &quot;bullets/&quot;)
-				If BulletDir &lt;&gt; &quot;&quot; Then
-					PhotosDir = GetPathSettings(&quot;Gallery&quot;, False, 1)
-					If PhotosDir &lt;&gt; &quot;&quot; Then
-						TemplatePath = GetOfficeSubPath(&quot;Template&quot;, &quot;wizard/web/&quot;)
-						If TemplatePath &lt;&gt; &quot;&quot; Then
-							SOBitmapPath = GetOfficeSubPath(&quot;Template&quot;, &quot;wizard/bitmap&quot;)
-							If SOBitmapPath &lt;&gt; &quot;&quot; Then
-								GetWebwizardPaths() = True
-								Exit Function
+	If TextureDir &lt;&gt; &quot;&quot; Then
+		GraphicsDir = GetOfficeSubPath(&quot;Gallery&quot;,&quot;www-graf/&quot;)
+		If GraphicsDir &lt;&gt; &quot;&quot; Then
+			BulletDir = GetOfficeSubPath(&quot;Gallery&quot;, &quot;bullets/&quot;)
+			If BulletDir &lt;&gt; &quot;&quot; Then
+				PhotosDir = GetPathSettings(&quot;Gallery&quot;, False, 1)
+				If PhotosDir &lt;&gt; &quot;&quot; Then
+					TemplatePath = GetOfficeSubPath(&quot;Template&quot;, &quot;wizard/web/&quot;)
+					If TemplatePath &lt;&gt; &quot;&quot; Then
+						SOBitmapPath = GetOfficeSubPath(&quot;Template&quot;, &quot;wizard/bitmap&quot;)
+						If SOBitmapPath &lt;&gt; &quot;&quot; Then
+							GetWebwizardPaths() = True
+							Exit Function
 							End If
-						End If
 					End If
 				End If
 			End If
 		End If
-	If Not IsNull(oDocument) Then
-		oBaseDocument.dispose()
 	End If
+	DisposeDocument(oBaseDocument)
 	GetWebWizardPaths() = False
 End Function
 
-- 
cgit