From 9573e34faf96728ed333d464fd71cbf83f0ef5fe Mon Sep 17 00:00:00 2001 From: Behrend Cornelius Date: Mon, 19 Nov 2001 15:30:31 +0000 Subject: #94832# Routine 'CopyGraphics' and "EndDialog" modified --- wizards/source/webwizard/HtmlAutoPilotBasic.xba | 14 +++++++------- wizards/source/webwizard/dialog.xlb | 4 ++-- wizards/source/webwizard/script.xlb | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'wizards/source/webwizard') diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba index 0ef9cc8f2de6..bcb6e4b40906 100644 --- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba +++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba @@ -19,7 +19,6 @@ Public NumberOfLayouts%, NumberOfStyles% ' Filled with title, previous, next, home, top, bullet, background, file name Public Style(8, MaxStyles) as String -' Filled with title, file name Public Layout$(2, MaxLayouts) Public TextureDir$, BulletDir$, GraphicsDir$, GalleryDir$, PhotosDir$ @@ -131,7 +130,7 @@ On Local Error Goto ErrorOcurred End If oBaseDocument.UnlockControllers oViewCursor.GotoStart(False) - ToggleDialogControls(True, "lbTemplate") + ToggleDialogControls(True, "lbTemplate") End If End Sub @@ -205,10 +204,9 @@ Sub EndDialog() AttachBasicMacroToEvent(oBaseDocument,"OnNew", "WebWizard.HtmlAutoPilotBasic.SetEvent()") ' Call the Store template dialog DispatchSlot(5538) - Else - SetEvent() + AttachBasicMacroToEvent(oBaseDocument,"OnNew", "") End If -' MainDialog.EndExecute() + SetEvent() End Sub @@ -237,7 +235,9 @@ Dim SavePath as String BasicLibraries.LoadLibrary("Tools") oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess") GetPaths() - oBaseDocument = StarDesktop.ActiveFrame.Controller.Model + oBaseDocument = ThisComponent +' oBaseDocument.LockControllers() + ' Note: The sub DirectoryNameoutofPath should be change, so that the last character is a slash SavePath = DirectoryNameoutofPath(oBaseDocument.Url, "/") & "/" @@ -258,11 +258,11 @@ Dim SavePath as String .GetUserFieldValue(3) = "" End With -' ' Reset events AttachBasicMacroToEvent(oBaseDocument,"OnSaveDone", "") AttachBasicMacroToEvent(oBaseDocument,"OnSaveAsDone", "") AttachBasicMacroToEvent(oBaseDocument,"OnNew", "") oBaseDocument.Store +' oBaseDocument.UnlockControllers() End Sub diff --git a/wizards/source/webwizard/dialog.xlb b/wizards/source/webwizard/dialog.xlb index d1b9cb066f0c..76e5001d0066 100644 --- a/wizards/source/webwizard/dialog.xlb +++ b/wizards/source/webwizard/dialog.xlb @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/wizards/source/webwizard/script.xlb b/wizards/source/webwizard/script.xlb index 1045820b7002..506d68bac301 100644 --- a/wizards/source/webwizard/script.xlb +++ b/wizards/source/webwizard/script.xlb @@ -1,8 +1,8 @@ - + - + \ No newline at end of file -- cgit v1.2.3