diff options
Diffstat (limited to 'wizards/source')
| -rw-r--r-- | wizards/source/importwizard/API.xba | 2 | ||||
| -rw-r--r-- | wizards/source/importwizard/DialogModul.xba | 2 | ||||
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 23 | ||||
| -rw-r--r-- | wizards/source/importwizard/ImportDialog.xdl | 4 | ||||
| -rw-r--r-- | wizards/source/importwizard/Language.xba | 2 | ||||
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 6 | ||||
| -rw-r--r-- | wizards/source/importwizard/script.xlb | 14 |
7 files changed, 19 insertions, 34 deletions
diff --git a/wizards/source/importwizard/API.xba b/wizards/source/importwizard/API.xba index 7a4c7809fef8..0f48f55300b3 100644 --- a/wizards/source/importwizard/API.xba +++ b/wizards/source/importwizard/API.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="API" script:language="StarBasic">Declare Function RegOpenKeyEx Lib "advapi32.dll" Alias "RegOpenKeyExA" _ +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="API" script:language="StarBasic">Declare Function RegOpenKeyEx Lib "advapi32.dll" Alias "RegOpenKeyExA" _ (ByVal hKey As Long, _ ByVal lpSubKey As String, _ ByVal ulOptions As Long, _ diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index 83fef2a7be69..e539043d97c1 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.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="DialogModul" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DialogModul" script:language="StarBasic">Option Explicit Public Const bDebugWizard = False 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 diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index 6f039f9a7c60..d8a430882f4e 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -28,7 +28,9 @@ <dlg:button dlg:id="cmdBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34573" dlg:value="cmdBack"> <script:event script:event-name="on-performaction" script:location="application" script:macro-name="ImportWizard.Main.PrevStep" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34572" dlg:value="cmdCancel" dlg:button-type="cancel"/> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34572" dlg:value="cmdCancel"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="ImportWizard.Main.CallCancelTask" script:language="StarBasic"/> + </dlg:button> <dlg:button dlg:id="cmdHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="34571" dlg:value="cmdHelp" dlg:button-type="help"/> <dlg:button dlg:id="cmdGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34574" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:location="application" script:macro-name="ImportWizard.Main.NextStep" script:language="StarBasic"/> diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba index 29418f606c17..969510484fef 100644 --- a/wizards/source/importwizard/Language.xba +++ b/wizards/source/importwizard/Language.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="Language" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Language" script:language="StarBasic">Option Explicit Public sMSTemplateCheckbox(2) As String Public sMSDocumentCheckbox(2) As String diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 6aef91d63a9d..5867f8fbbed8 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.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="Main" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Main" script:language="StarBasic">Option Explicit ' ***** BASIC ***** ' Todo: Problematik der VBA-Makros, die angeblich nicht mit abgespeichert werden koennen. @@ -13,13 +13,14 @@ Public bSetFonts as Boolean ' set to False Public bConversionIsRunnig as Boolean Public oFactoriesAccess as Object +Public RetValue as Integer Sub Main() -Dim RetValue as Integer If Not bDebugWizard Then On Local Error Goto RTError End If BasicLibraries.LoadLibrary("Tools") + RetValue = 10 bSetFonts = False bConversionIsRunnig = False If bSetFonts Then @@ -131,6 +132,7 @@ Sub CallCancelTask() CancelTask(True) End Sub + Sub CancelTask(bCloseDialog as Boolean) If bConversionIsRunnig Then If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then diff --git a/wizards/source/importwizard/script.xlb b/wizards/source/importwizard/script.xlb index 3407d053747c..2d10f65cba30 100644 --- a/wizards/source/importwizard/script.xlb +++ b/wizards/source/importwizard/script.xlb @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="ImportWizard" library:readonly="true" library:passwordprotected="false"> - <library:element library:name="Main"/> - <library:element library:name="DialogModul"/> - <library:element library:name="Language"/> - <library:element library:name="FilesModul"/> - <library:element library:name="API"/> - </library:library> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ImportWizard" library:readonly="true" library:passwordprotected="false"> + <library:element library:name="Main"/> + <library:element library:name="DialogModul"/> + <library:element library:name="Language"/> + <library:element library:name="FilesModul"/> + <library:element library:name="API"/> +</library:library> |