diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2002-01-11 08:49:32 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2002-01-11 08:49:32 +0000 |
| commit | 4735fb3bce17ceba16b697c4ea44f2bc2120fe4c (patch) | |
| tree | 17fc50695270ae7e4e62b4b7d7911bec11b05253 /wizards/source/importwizard/FilesModul.xba | |
| parent | a8a7a8eaf25d1ec67d77cc140c714e888339219a (diff) | |
#96344# Cancel button now Standard button
Diffstat (limited to 'wizards/source/importwizard/FilesModul.xba')
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index 06b01417899d..41d50ae2df3f 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> - <script:module xmlns:script="http://openoffice.org/2000/script" script:name="FilesModul" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="FilesModul" script:language="StarBasic">Option Explicit Public AbsTemplateFound as Integer Public AbsDocuFound as Integer @@ -93,10 +93,7 @@ Dim bIsDocument as Boolean Dim iOverWrite as Integer Dim bDoSave as Boolean Dim sCurFileExists as String -Dim oTaskEnum as Object -Dim oTask as Object Dim oModel as Object -Dim oTaskController as Object Dim MaxFileIndex as Integer Dim sOldExtension as String bConversionIsRunnig = True @@ -123,7 +120,7 @@ Dim sOldExtension as String OpenProperties(1).Name = "AsTemplate" MaxFileIndex = Ubound(FilesList(),1) For i = 0 To MaxFileIndex - If bCancelTask Then + If bCancelTask Or RetValue = 0 Then bConversionIsRunnig = False Exit Sub End if @@ -136,8 +133,6 @@ Dim sOldExtension as String sOldExtension = GetFileNameExtension(sFullName, "/") Select Case sOldExtension -' Todo: This code should be simplified as soon as it is clear how 'LoadComponentfromUrl' exactly works with -' templates and documents Case "vor", "dot", "xlt", "pot" OpenProperties(1).Value = False Case Else @@ -192,20 +187,6 @@ Dim sOldExtension as String oDocument.Dispose() On Local Error Goto 0 End If -' oTaskenum = StarDesktop.Tasks.CreateEnumeration -' While oTaskEnum.HasmoreElements -' oTask = oTaskenum.NextElement -' If oTask.Name <> "" Then -' oTaskController = oTask.Controller -' PrintdbgInfo oTaskController -' If hasUnoInterfaces(oTaskController,"com.sun.star.frame.XModel") then -' oModel = oTaskController.Model -' If Ucase(oModel.Url) = Ucase(sFullName) Then -' oTask.Close -' End If -' End If -' End If -' Wend End If Next i End If |