summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorBehrend Cornelius <bc@openoffice.org>2001-07-12 09:39:01 +0000
committerBehrend Cornelius <bc@openoffice.org>2001-07-12 09:39:01 +0000
commit8f3f4a573a879e997c4aa60e117525d145349fb4 (patch)
tree81316342be4afc052a16459293d8e411f35db6b0 /wizards
parent56f146dcfe594a6407993dbb8906bc4a22d5872c (diff)
#88911# handling of Path input improved
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/importwizard/DialogModul.xba83
-rw-r--r--wizards/source/importwizard/FilesModul.xba20
-rw-r--r--wizards/source/importwizard/ImportDialog.xdl124
-rw-r--r--wizards/source/importwizard/Language.xba6
-rw-r--r--wizards/source/importwizard/Main.xba57
5 files changed, 151 insertions, 139 deletions
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 2c8f9de50bbf..0e49a160a3d1 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -8,7 +8,6 @@ Public Const SBFIRSTAPPLCHECKED = 0
Public Const SBSECONDAPPLCHECKED = 1
Public Const SBTHIRDAPPLCHECKED = 2
Public Const SBFOURTHAPPLCHECKED = 3
-&apos;Public bDoKeepApplValues as Boolean
Public WizardMode as String
Public Const SBMICROSOFTMODE = &quot;MS&quot;
Public Const SBXMLMODE = &quot;XML&quot;
@@ -91,7 +90,7 @@ Dim i as Integer
.cbBack.Enabled = False
.Step = 1
End With
- DisorEnableNextButton()
+ ToggleNextButton()
End Sub
@@ -107,15 +106,12 @@ Dim Index as Integer
GetApplResourceArray(1009 + iApplSection, ApplCount, sTemplateCheckBox())
&apos; DocumentCheckbox- Captions
GetApplResourceArray(1009 + iApplSection + ApplCount, ApplCount, sDocumentCheckBox())
-
AssignCheckboxObjects()
-
FillUpApplicationList()
End If
-
CurOffice = OfficeIndex
-
Index = Applications(CurOffice,SBAPPLKEY)
+ InitializePathsforCurrentApplication(Index)
With ImportDialog
.TemplateCheckbox.Label = sTemplateCheckbox(Index)
.DocumentPathCheckbox.State = Abs(Applications(CurOffice,SBDOCCONVERT))
@@ -123,17 +119,17 @@ Dim Index as Integer
.DocumentSearchSubDir.State = Abs(Applications(CurOffice,SBDOCRECURSIVE))
.DocumentImportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCSOURCE))
.DocumentExportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCTARGET))
- .DocumentFrame.Label = sProgressMoreDocs
+ .hlnDocuments.Label = sProgressMoreDocs
If WizardMode = SBXMLMODE AND Index = 3 Then
&apos; Note: SO-Helper Applications are partly treated like templates although they only have documents
- .TemplateFrame.Label = sProgressMoreDocs
+ .hlnTemplates.Label = sProgressMoreDocs
.TemplateCheckbox.Label = sSOHelperDocuments(0)
.DocumentPathCheckbox.Label = sSOHelperDocuments(1)
Else
.TemplateCheckbox.Label = sTemplateCheckbox(Index)
.DocumentPathCheckbox.Label = sDocumentCheckbox(Index)
- .TemplateFrame.Label = sProgressMoreTemplates
+ .hlnTemplates.Label = sProgressMoreTemplates
End If
.TemplateCheckbox.State = Abs(Applications(CurOffice,SBTEMPLCONVERT))
SetEnabledTemplate_InputPath()
@@ -144,54 +140,66 @@ Dim Index as Integer
.cbBack.Enabled = True
ImportDialog.Step = 2
End With
- DisOrEnableNextButton()
+ ToggleNextButton()
End Sub
-Sub FillUpApplicationList()
+Sub FillUpApplicationList()
Dim i as Integer
Dim a as Integer
Dim BoolValue as Boolean
-
If Not bDoKeepApplValues Then
a = 0
For i = 0 To ApplCount - 1
- BoolValue = ChkApplication(i).State = 1
+ BoolValue = ChkApplication(i).State = 1
Applications(a,SBAPPLCONVERT) = BoolValue
Applications(a,SBDOCCONVERT) = BoolValue
Applications(a,SBDOCRECURSIVE) = BoolValue
- Applications(a,SBDOCSOURCE) = GetDefaultPath(i)
- Applications(a,SBDOCTARGET) = SOWorkPath
+ Applications(a,SBDOCSOURCE) = &quot;&quot; &apos; GetDefaultPath(i)
+ Applications(a,SBDOCTARGET) = &quot;&quot; &apos; SOWorkPath
Applications(a,SBTEMPLCONVERT) = BoolValue
Applications(a,SBTEMPLRECURSIVE) = BoolValue
- Applications(a,SBTEMPLSOURCE) = GetTemplateDefaultPath(i)
- Applications(a,SBTEMPLTARGET) = GetTargetTemplatePath(i)
+ Applications(a,SBTEMPLSOURCE) = &quot;&quot; &apos; GetTemplateDefaultPath(i)
+ Applications(a,SBTEMPLTARGET) = &quot;&quot; &apos; GetTargetTemplatePath(i)
Applications(a,SBAPPLKEY) = i
- If ChkApplication(i).State = 1 Then
- a = a + 1
- End If
+ If ChkApplication(i).State = 1 Then
+ a = a + 1
+ End If
Next i
ApplCount = a
End If
End Sub
+Sub InitializePathsforCurrentApplication(i as Integer)
+ AssignPathToCurrentApplication(SBDOCSOURCE, GetDefaultPath(i))
+ AssignPathToCurrentApplication(SBDOCTARGET, SOWorkPath)
+ AssignPathToCurrentApplication(SBTEMPLSOURCE, GetTemplateDefaultPath(i))
+ AssignPathToCurrentApplication(SBTEMPLTARGET, GetTargetTemplatePath(i))
+End Sub
+
-Function SaveStep_InputPath() as Boolean
-Dim bSaveConfiguration as Boolean
- bSaveConfiguration = CheckInputPaths
- If bSaveConfiguration Then
- Applications(CurOffice,SBDOCCONVERT) = ImportDialog.DocumentPathCheckbox.State = 1
- Applications(CurOffice,SBDOCRECURSIVE) = ImportDialog.DocumentSearchSubDir.State = 1
- Applications(CurOffice,SBDOCSOURCE) = ConvertToURL(ImportDialog.DocumentImportPath.Text)
- Applications(CurOffice,SBDOCTARGET) = ConvertToUrl(ImportDialog.DocumentExportPath.Text)
- Applications(CurOffice,SBTEMPLCONVERT) = ImportDialog.TemplateCheckbox.State = 1
- Applications(CurOffice,SBTEMPLRECURSIVE) = ImportDialog.TemplateSearchSubDir.State = 1
- Applications(CurOffice,SBTEMPLSOURCE) = ConvertToURL(ImportDialog.TemplateImportPath.Text)
- Applications(CurOffice,SBTEMPLTARGET) = ConvertToURL(ImportDialog.TemplateExportPath.Text)
+Sub AssignPathToCurrentApplication(Index as Integer, NewPath as String)
+ If Applications(CurOffice,Index) = &quot;&quot; Then
+ If CurOffice &gt; 0 Then
+ Applications(CurOffice,Index) = Applications(CurOffice-1,Index)
+ Else
+ Applications(CurOffice,Index) = NewPath
+ End If
End If
- SaveStep_InputPath = bSaveConfiguration
-End Function
+End Sub
+
+
+Sub SaveStep_InputPath()
+ Applications(CurOffice,SBDOCCONVERT) = ImportDialog.DocumentPathCheckbox.State = 1
+ Applications(CurOffice,SBDOCRECURSIVE) = ImportDialog.DocumentSearchSubDir.State = 1
+ Applications(CurOffice,SBDOCSOURCE) = ConvertToURL(ImportDialog.DocumentImportPath.Text)
+ Applications(CurOffice,SBDOCTARGET) = ConvertToUrl(ImportDialog.DocumentExportPath.Text)
+ Applications(CurOffice,SBTEMPLCONVERT) = ImportDialog.TemplateCheckbox.State = 1
+ Applications(CurOffice,SBTEMPLRECURSIVE) = ImportDialog.TemplateSearchSubDir.State = 1
+ Applications(CurOffice,SBTEMPLSOURCE) = ConvertToURL(ImportDialog.TemplateImportPath.Text)
+ Applications(CurOffice,SBTEMPLTARGET) = ConvertToURL(ImportDialog.TemplateExportPath.Text)
+End Sub
Sub SetEnabledTemplate_InputPath()
@@ -295,7 +303,7 @@ Sub FillStep_Progress()
With ImportDialog
.cbBack.Enabled = False
.cbGoOn.Enabled = False
- .FrameProgress.Label = sProgressPage_1
+ .hlnProgress.Label = sProgressPage_1
.LabelRetrieval.FontWeight = com.sun.star.awt.FontWeight.BOLD
.LabelRetrieval.Label = sProgressPage_2
.LabelCurProgress.Label = sProgressPage_3
@@ -409,11 +417,12 @@ End Sub
Function CheckControlPath(oTextBox as Object, ByVal bDoEnable as Boolean)
-Dim Path as String
+Dim sPath as String
If Not bDoEnable Then
CheckControlPath = False
Else
- CheckControlPath = oTextBox.Text &lt;&gt; &quot;&quot;
+ sPath = ConvertToUrl(Trim(oTextBox.Text)
+ CheckControlPath = oUcb.Exists(sPath)
End If
End Function
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index 054fcc18b69a..f89a74cdc490 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -48,7 +48,7 @@ Dim sLocExtension as String
sFileContent() = GetMimeTypeList(sFilterName(FilterIndex))
NewList() = ReadDirectories(sSourceDir, bRecursive, bCheckRealType, False, sFileContent(), sLocExtension)
If Ubound(NewList()) &gt; -1 Then
- AddListtoList(FilesList(), NewList(), ApplIndex)
+ AddListtoFilesList(FilesList(), NewList(), ApplIndex)
ImportDialog.LabelRetrieval.Label = sProgressPage_2 &amp; &quot; &quot; &amp; ReplaceString(sProgressPage_5, Str(Ubound(FilesList()) + 1) &amp; &quot; &quot;, &quot;%1&quot;)
End If
End If
@@ -200,10 +200,12 @@ Dim MaxFileIndex as Integer
&apos; Wend
End If
Next i
- ImportDialog.cbCancel.Label = sCloseButton
- Msgbox sReady, 64, sTitle
- bCallCancelMsg = False
End If
+ ImportDialog.cbCancel.Label = sCloseButton
+ ImportDialog.cbGoOn.Label = sReady
+ ImportDialog.cbGoOn.Enabled = True
+ bCallCancelMsg = False
+
&apos; oLogDocument.Dispose()
&apos; ImportDialogArea.endExecute
&apos; ImportDialogArea.Dispose
@@ -215,9 +217,13 @@ RTError:
End Sub
-Sub AddListtoList(FirstList(), SecList(), ApplIndex as Integer)
+Sub AddListtoFilesList(FirstList(), SecList(), ApplIndex as Integer)
Dim FirstStart as Integer, FirstEnd as Integer, i as Integer, s as Integer
- FirstStart = Ubound(FirstList(),1)
+ If FirstList(0,0) = &quot;&quot; Then
+ FirstStart = Ubound(FirstList(),1)
+ Else
+ FirstStart = Ubound(FirstList(),1) + 1
+ End If
FirstEnd = FirstStart + Ubound(SecList(),1)
ReDim Preserve FirstList(FirstEnd,2)
s = 0
@@ -233,7 +239,7 @@ End Sub
Function GetTargetTemplatePath(Index as Integer)
Select Case WizardMode
Case SBMICROSOFTMODE
- GetTargetTemplatePath() = SOTemplatePath &amp; &quot;/&quot; &amp; sTemplateGroupName(Index)
+ GetTargetTemplatePath() = SOTemplatePath &amp; &quot;/&quot; &amp; sTemplateGroupName
Case SBXMLMODE
If Index = 3 Then
&apos; Helper Application
diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl
index e6d5daab14f8..f70a750e5ff8 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -1,99 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="ImportDialog" dlg:style-id="0" dlg:title="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1">
- <dlg:styles>
- <dlg:style dlg:style-id="0"/>
- </dlg:styles>
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="ImportDialog" dlg:title="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2">
<dlg:bulletinboard>
- <dlg:text dlg:style-id="0" dlg:id="TemplateExportLabel" dlg:tab-index="0" dlg:left="10" dlg:top="94" dlg:width="60" dlg:height="12" dlg:page="2" dlg:value="TemplateExportLabel"/>
- <dlg:textfield dlg:style-id="0" dlg:id="TemplateImportPath" dlg:tab-index="1" dlg:left="71" dlg:top="80" dlg:width="170" dlg:height="12" dlg:page="2"/>
- <dlg:textfield dlg:style-id="0" dlg:id="TemplateExportPath" dlg:tab-index="2" dlg:left="71" dlg:top="94" dlg:width="170" dlg:height="12" dlg:page="2"/>
- <dlg:checkbox dlg:style-id="0" dlg:id="DocumentPathCheckbox" dlg:tab-index="3" dlg:left="10" dlg:top="125" dlg:width="240" dlg:height="12" dlg:page="2" dlg:value="DocumentPathCheckbox">
+ <dlg:text dlg:id="TemplateExportLabel" dlg:tab-index="0" dlg:left="12" dlg:top="94" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="TemplateExportLabel"/>
+ <dlg:textfield dlg:id="TemplateImportPath" dlg:tab-index="1" dlg:left="73" dlg:top="76" dlg:width="170" dlg:height="12" dlg:page="2">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XTextListener" dlg:event-method="textChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
+ </dlg:textfield>
+ <dlg:textfield dlg:id="TemplateExportPath" dlg:tab-index="2" dlg:left="73" dlg:top="92" dlg:width="170" dlg:height="12" dlg:page="2"/>
+ <dlg:checkbox dlg:id="DocumentPathCheckbox" dlg:tab-index="3" dlg:left="12" dlg:top="121" dlg:width="240" dlg:height="10" dlg:page="2" dlg:value="DocumentPathCheckbox">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.SetEnabledDocument_InputPath"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="DocumentSearchSubDir" dlg:tab-index="4" dlg:left="10" dlg:top="138" dlg:width="240" dlg:height="12" dlg:page="2" dlg:value="DocumentSearchSubDir"/>
- <dlg:text dlg:style-id="0" dlg:id="DocumentImportLabel" dlg:tab-index="5" dlg:left="10" dlg:top="154" dlg:width="60" dlg:height="12" dlg:page="2" dlg:value="DocumentImportLabel"/>
- <dlg:text dlg:style-id="0" dlg:id="DocumentExportLabel" dlg:tab-index="6" dlg:left="10" dlg:top="169" dlg:width="60" dlg:height="12" dlg:page="2" dlg:value="DocumentExportLabel"/>
- <dlg:textfield dlg:style-id="0" dlg:id="DocumentImportPath" dlg:tab-index="7" dlg:left="71" dlg:top="154" dlg:width="170" dlg:height="12" dlg:page="2"/>
- <dlg:textfield dlg:style-id="0" dlg:id="DocumentExportPath" dlg:tab-index="8" dlg:left="71" dlg:top="169" dlg:width="170" dlg:height="12" dlg:page="2"/>
- <dlg:titledbox dlg:style-id="0" dlg:id="TemplateFrame" dlg:tab-index="9" dlg:left="5" dlg:top="40" dlg:width="260" dlg:height="70" dlg:page="2">
- <dlg:title dlg:value="TemplateFrame"/>
- </dlg:titledbox>
- <dlg:text dlg:style-id="0" dlg:id="SummaryHeaderLabel" dlg:tab-index="10" dlg:left="5" dlg:top="40" dlg:width="260" dlg:height="12" dlg:page="3" dlg:value="SummaryHeaderLabel"/>
- <dlg:textfield dlg:style-id="0" dlg:id="SummaryTextbox" dlg:tab-index="11" dlg:left="5" dlg:top="55" dlg:width="259" dlg:height="125" dlg:page="3" dlg:vscroll="true" dlg:multiline="true"/>
- <dlg:titledbox dlg:style-id="0" dlg:id="FrameProgress" dlg:tab-index="12" dlg:left="5" dlg:top="50" dlg:width="260" dlg:height="110" dlg:page="4">
- <dlg:title dlg:value="FrameProgress"/>
- </dlg:titledbox>
- <dlg:text dlg:style-id="0" dlg:id="LabelRetrieval" dlg:tab-index="13" dlg:left="10" dlg:top="65" dlg:width="240" dlg:height="12" dlg:page="4" dlg:value="LabelRetrieval"/>
- <dlg:text dlg:style-id="0" dlg:id="LabelCurTemplateRetrieval" dlg:tab-index="14" dlg:left="15" dlg:top="80" dlg:width="235" dlg:height="12" dlg:page="4" dlg:value="LabelCurTemplateRetrieval"/>
- <dlg:text dlg:style-id="0" dlg:id="LabelCurDocumentRetrieval" dlg:tab-index="15" dlg:left="15" dlg:top="95" dlg:width="235" dlg:height="12" dlg:page="4" dlg:value="LabelCurDocumentRetrieval"/>
- <dlg:text dlg:style-id="0" dlg:id="LabelCurProgress" dlg:tab-index="16" dlg:left="10" dlg:top="120" dlg:width="240" dlg:height="12" dlg:page="4" dlg:value="LabelCurProgress"/>
- <dlg:text dlg:style-id="0" dlg:id="LabelCurDocument" dlg:tab-index="17" dlg:left="15" dlg:top="135" dlg:width="235" dlg:height="12" dlg:page="4" dlg:value="LabelCurDocument"/>
- <dlg:img dlg:id="ImportPreview" dlg:tab-index="18" dlg:left="6" dlg:top="5" dlg:width="258" dlg:height="26"/>
- <dlg:button dlg:style-id="0" dlg:id="cbBack" dlg:tab-index="19" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cbBack">
+ <dlg:checkbox dlg:id="DocumentSearchSubDir" dlg:tab-index="4" dlg:left="12" dlg:top="134" dlg:width="240" dlg:height="10" dlg:page="2" dlg:value="DocumentSearchSubDir"/>
+ <dlg:text dlg:id="DocumentImportLabel" dlg:tab-index="5" dlg:left="10" dlg:top="151" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="DocumentImportLabel"/>
+ <dlg:text dlg:id="DocumentExportLabel" dlg:tab-index="6" dlg:left="10" dlg:top="167" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="DocumentExportLabel"/>
+ <dlg:textfield dlg:id="DocumentImportPath" dlg:tab-index="7" dlg:left="73" dlg:top="149" dlg:width="170" dlg:height="12" dlg:page="2">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XTextListener" dlg:event-method="textChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
+ </dlg:textfield>
+ <dlg:textfield dlg:id="DocumentExportPath" dlg:tab-index="8" dlg:left="73" dlg:top="165" dlg:width="170" dlg:height="12" dlg:page="2"/>
+ <dlg:text dlg:id="SummaryHeaderLabel" dlg:tab-index="9" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="SummaryHeaderLabel"/>
+ <dlg:textfield dlg:id="SummaryTextbox" dlg:tab-index="10" dlg:left="5" dlg:top="48" dlg:width="259" dlg:height="125" dlg:page="3" dlg:vscroll="true" dlg:multiline="true"/>
+ <dlg:text dlg:id="LabelRetrieval" dlg:tab-index="11" dlg:left="10" dlg:top="67" dlg:width="240" dlg:height="8" dlg:page="4" dlg:value="LabelRetrieval"/>
+ <dlg:text dlg:id="LabelCurTemplateRetrieval" dlg:tab-index="12" dlg:left="15" dlg:top="79" dlg:width="235" dlg:height="8" dlg:page="4" dlg:value="LabelCurTemplateRetrieval"/>
+ <dlg:text dlg:id="LabelCurDocumentRetrieval" dlg:tab-index="13" dlg:left="15" dlg:top="91" dlg:width="235" dlg:height="8" dlg:page="4" dlg:value="LabelCurDocumentRetrieval"/>
+ <dlg:text dlg:id="LabelCurProgress" dlg:tab-index="14" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="8" dlg:page="4" dlg:value="LabelCurProgress"/>
+ <dlg:text dlg:id="LabelCurDocument" dlg:tab-index="15" dlg:left="15" dlg:top="118" dlg:width="235" dlg:height="8" dlg:page="4" dlg:value="LabelCurDocument"/>
+ <dlg:img dlg:id="ImportPreview" dlg:tab-index="16" dlg:left="6" dlg:top="5" dlg:width="258" dlg:height="26"/>
+ <dlg:button dlg:id="cbBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cbBack">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.PrevStep"/>
</dlg:button>
- <dlg:titledbox dlg:style-id="0" dlg:id="DocumentFrame" dlg:tab-index="20" dlg:left="5" dlg:top="115" dlg:width="260" dlg:height="70" dlg:page="2">
- <dlg:title dlg:value="DocumentFrame"/>
- </dlg:titledbox>
- <dlg:button dlg:style-id="0" dlg:id="cbCancel" dlg:tab-index="21" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cbCancel">
+ <dlg:button dlg:id="cbCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" 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:style-id="0" dlg:id="cbHelp" dlg:tab-index="22" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cbHelp">
+ <dlg:button dlg:id="cbHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" 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:button dlg:style-id="0" dlg:id="cbGoOn" dlg:tab-index="23" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cbGoOn">
+ <dlg:button dlg:id="cbGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" 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"/>
</dlg:button>
- <dlg:text dlg:style-id="0" dlg:id="WelcomeTextLabel" dlg:tab-index="24" dlg:left="6" dlg:top="41" dlg:width="258" dlg:height="20" dlg:page="1" dlg:value="WelcomeTextLabel" dlg:multiline="true"/>
- <dlg:text dlg:style-id="0" dlg:id="WelcomeTextLabel3" dlg:tab-index="25" dlg:left="6" dlg:top="61" dlg:width="258" dlg:height="12" dlg:page="1" dlg:value="WelcomeTextLabel3"/>
- <dlg:button dlg:style-id="0" dlg:id="Button1" dlg:tab-index="26" dlg:left="245" dlg:top="80" dlg:width="12" dlg:height="12" dlg:page="2" dlg:tag="TemplateImportPath" dlg:value="...">
+ <dlg:text dlg:id="WelcomeTextLabel" dlg:tab-index="21" dlg:left="6" dlg:top="38" dlg:width="258" dlg:height="20" dlg:page="1" dlg:value="WelcomeTextLabel" dlg:multiline="true"/>
+ <dlg:text dlg:id="WelcomeTextLabel3" dlg:tab-index="22" dlg:left="6" dlg:top="58" dlg:width="258" dlg:height="12" dlg:page="1" dlg:value="WelcomeTextLabel3"/>
+ <dlg:button dlg:id="Button1" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="TemplateImportPath" dlg:value="...">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/>
</dlg:button>
- <dlg:button dlg:style-id="0" dlg:id="Button2" dlg:tab-index="27" dlg:left="245" dlg:top="94" dlg:width="12" dlg:height="12" dlg:page="2" dlg:tag="TemplateExportPath" dlg:value="...">
+ <dlg:button dlg:id="Button2" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="TemplateExportPath" dlg:value="...">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/>
</dlg:button>
- <dlg:button dlg:style-id="0" dlg:id="Button3" dlg:tab-index="28" dlg:left="245" dlg:top="154" dlg:width="12" dlg:height="12" dlg:page="2" dlg:tag="DocumentImportPath" dlg:value="...">
+ <dlg:button dlg:id="Button3" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="DocumentImportPath" dlg:value="...">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/>
</dlg:button>
- <dlg:button dlg:style-id="0" dlg:id="Button4" dlg:tab-index="29" dlg:left="245" dlg:top="169" dlg:width="12" dlg:height="12" dlg:page="2" dlg:tag="DocumentExportPath" dlg:value="...">
+ <dlg:button dlg:id="Button4" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="DocumentExportPath" dlg:value="...">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/>
</dlg:button>
<dlg:radiogroup>
- <dlg:radio dlg:style-id="0" dlg:id="OptSODocuments" dlg:tab-index="30" dlg:left="6" dlg:top="75" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="XML" dlg:value="OptSODocuments">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisorEnableCheckboxes"/>
+ <dlg:radio dlg:id="OptSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="XML" dlg:value="OptSODocuments">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleCheckboxes"/>
</dlg:radio>
- <dlg:radio dlg:style-id="0" dlg:id="OptMSDocuments" dlg:tab-index="31" dlg:left="6" dlg:top="117" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:value="OptMSDocuments">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisorEnableCheckboxes"/>
+ <dlg:radio dlg:id="OptMSDocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:value="OptMSDocuments">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleCheckboxes"/>
</dlg:radio>
</dlg:radiogroup>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkFirstSOApplication" dlg:tab-index="32" dlg:left="11" dlg:top="88" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFirstSOApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkFirstSOApplication" dlg:tab-index="29" dlg:left="12" dlg:top="85" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFirstSOApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkSecondSOApplication" dlg:tab-index="33" dlg:left="135" dlg:top="88" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkSecondSOApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkSecondSOApplication" dlg:tab-index="30" dlg:left="136" dlg:top="85" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkSecondSOApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkThirdSOApplication" dlg:tab-index="34" dlg:left="11" dlg:top="101" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkThirdSOApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkThirdSOApplication" dlg:tab-index="31" dlg:left="12" dlg:top="98" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkThirdSOApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkFourthSOApplication" dlg:tab-index="35" dlg:left="135" dlg:top="101" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFourthSOApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkFourthSOApplication" dlg:tab-index="32" dlg:left="136" dlg:top="98" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFourthSOApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkFirstMSApplication" dlg:tab-index="36" dlg:disabled="true" dlg:left="11" dlg:top="130" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFirstMSApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkFirstMSApplication" dlg:tab-index="33" dlg:disabled="true" dlg:left="12" dlg:top="126" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkFirstMSApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkSecondMSApplication" dlg:tab-index="37" dlg:disabled="true" dlg:left="135" dlg:top="130" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkSecondMSApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkSecondMSApplication" dlg:tab-index="34" dlg:disabled="true" dlg:left="136" dlg:top="126" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkSecondMSApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="ChkThirdMSApplication" dlg:tab-index="38" dlg:disabled="true" dlg:left="11" dlg:top="143" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkThirdMSApplication">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.DisOrEnableNextButton"/>
+ <dlg:checkbox dlg:id="ChkThirdMSApplication" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="120" dlg:height="9" dlg:page="1" dlg:value="ChkThirdMSApplication">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.Main.ToggleNextButton"/>
</dlg:checkbox>
- <dlg:text dlg:style-id="0" dlg:id="WelcomeTextLabel2" dlg:tab-index="39" dlg:disabled="true" dlg:left="6" dlg:top="156" dlg:width="258" dlg:height="18" dlg:page="1" dlg:value="WelcomeTextLabel2" dlg:multiline="true"/>
- <dlg:checkbox dlg:style-id="0" dlg:id="TemplateCheckbox" dlg:tab-index="40" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:page="2" dlg:value="TemplateCheckbox">
+ <dlg:text dlg:id="WelcomeTextLabel2" dlg:tab-index="36" dlg:disabled="true" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="18" dlg:page="1" dlg:value="WelcomeTextLabel2" dlg:multiline="true"/>
+ <dlg:checkbox dlg:id="TemplateCheckbox" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:value="TemplateCheckbox">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.SetEnabledTemplate_InputPath"/>
</dlg:checkbox>
- <dlg:checkbox dlg:style-id="0" dlg:id="TemplateSearchSubDir" dlg:tab-index="41" dlg:left="10" dlg:top="63" dlg:width="240" dlg:height="12" dlg:page="2" dlg:value="TemplateSearchSubDir"/>
- <dlg:text dlg:style-id="0" dlg:id="TemplateImportLabel" dlg:tab-index="42" dlg:left="10" dlg:top="80" dlg:width="60" dlg:height="12" dlg:page="2" dlg:value="TemplateImportLabel"/>
- <dlg:checkbox dlg:style-id="0" dlg:id="chkLogfile" dlg:tab-index="43" dlg:left="6" dlg:top="177" dlg:width="136" dlg:height="9" dlg:page="1" dlg:value="chkLogfile"/>
+ <dlg:checkbox dlg:id="TemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:value="TemplateSearchSubDir"/>
+ <dlg:text dlg:id="TemplateImportLabel" dlg:tab-index="39" dlg:left="12" dlg:top="78" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="TemplateImportLabel"/>
+ <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:value="chkLogfile"/>
+ <dlg:fixedline dlg:id="hlnTemplates" dlg:tab-index="41" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnTemplates"/>
+ <dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="42" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/>
+ <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="43" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/>
+ <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="44" dlg:left="6" dlg:top="55" dlg:width="258" dlg:height="8" dlg:page="4" dlg:value="hlnProgress"/>
</dlg:bulletinboard>
-</dlg:window>
+</dlg:window> \ No newline at end of file
diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba
index 188c44e3665f..8dc3e2a4eb2e 100644
--- a/wizards/source/importwizard/Language.xba
+++ b/wizards/source/importwizard/Language.xba
@@ -8,7 +8,7 @@ Public sSODocumentCheckbox(4) As String
Public sSOHelperdocuments(1) As String
Public sTemplateCheckbox(SBMAXAPPLCOUNT-1) As String
Public sDocumentCheckbox(SBMAXAPPLCOUNT-1) As String
-Public sTemplateGroupName(SBMAXAPPLCOUNT-1) As String
+Public sTemplateGroupName As String
Public sSearchInSubDir as String
Public sPathErrorTemplates(SBMAXAPPLCOUNT-1) As String
Public sPathErrorDocument(SBMAXAPPLCOUNT-1) As String
@@ -71,9 +71,7 @@ Sub LoadLanguage()
sSummaryHeader = GetResText(1031)
- sTemplateGroupName(0) = GetResText(1036)
- sTemplateGroupName(1) = GetResText(1037)
- sTemplateGroupName(2) = GetResText(1038)
+ sTemplateGroupName = GetResText(1036)
sProgressMoreDocs = GetResText(1041)
sProgressMoreTemplates = GetResText(1042)
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index ba7126ee17b9..62bfd0c36134 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()
+ ImportDialogArea.Visible = True &apos;Execute()
ImportDialog.cbGoOn.DefaultButton = True
Exit Sub
RTError:
@@ -66,7 +66,8 @@ Dim iCurStep as Integer
Case 1
FillStep_InputPaths(0, True)
Case 2
- If SaveStep_InputPath Then
+ If CheckInputPaths Then
+ SaveStep_InputPath
If CurOffice &lt; ApplCount - 1 Then
CurOffice = CurOffice + 1
TakeOverPathSettings()
@@ -84,6 +85,7 @@ Dim iCurStep as Integer
Call ConvertAllDocuments(XMLFilterName())
End Select
Case 4
+ CancelButton()
End Select
ImportDialog.cbGoOn.DefaultButton = True
RepaintHeaderPreview()
@@ -108,14 +110,13 @@ Dim iCurStep as Integer
&apos;Todo: muessen auch beim Zuruecksteppen wirklich die Importpfade auf ihre Gueltigkeit hin Ueberprueft werden?
FillStep_InputPaths(Applcount-1, False)
Case 2
- If SaveStep_InputPath Then
- If CurOffice &gt; 0 Then
- CurOffice = CurOffice - 1
- FillStep_InputPaths(CurOffice, False)
- Else
- FillStep_Welcome()
- bDoKeepApplValues = True
- End If
+ SaveStep_InputPath
+ If CurOffice &gt; 0 Then
+ CurOffice = CurOffice - 1
+ FillStep_InputPaths(CurOffice, False)
+ Else
+ FillStep_Welcome()
+ bDoKeepApplValues = True
End If
End Select
ImportDialog.cbGoOn.DefaultButton = True
@@ -126,13 +127,13 @@ RTError:
End Sub
-Sub CancelButton
+Sub CancelButton()
If bCallCancelMsg Then
&apos; Conversion is already running
ImportDialog.cbCancel.Enabled = False
bCancelTask = True
Else
- ImportDialogArea.EndExecute
+ ImportDialogArea.Visible = False &apos;EndExecute
ImportDialogArea.Dispose()
End
End If
@@ -141,7 +142,7 @@ End Sub
Sub CancelTask()
If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then
- ImportDialogArea.EndExecute
+ ImportDialogArea.Visible = False &apos;EndExecute
ImportDialogArea.Dispose
End
Else
@@ -177,7 +178,7 @@ Sub HelperDialog()
End Sub
-Sub DisorEnableCheckboxes(oEvent as Object)
+Sub ToggleCheckboxes(oEvent as Object)
Dim bMSEnable as Boolean
bMSEnable = oEvent.Source.Model.Tag = &quot;MS&quot;
With ImportDialog
@@ -191,11 +192,11 @@ Dim bMSEnable as Boolean
.WelcomeTextLabel2.Enabled = bMSEnable
End With
bDoKeepApplValues = False
- DisOrEnableNextButton()
+ ToggleNextButton()
End Sub
-Sub DisOrEnableNextButton()
+Sub ToggleNextButton()
Dim iCurStep as Integer
Dim bDoEnable as Boolean
Dim i as Integer
@@ -212,9 +213,9 @@ Dim i as Integer
bDoKeepApplValues = False
Case 2
bDoEnable = CheckControlPath(ImportDialog.TemplateImportPath, True)
- bDoEnable = CheckControlPath(ImportDialog.TemplateExportPath, bDoEnable)
+&apos; bDoEnable = CheckControlPath(ImportDialog.TemplateExportPath, bDoEnable)
bDoEnable = CheckControlPath(ImportDialog.DocumentImportPath, bDoEnable)
- bDoEnable = CheckControlPath(ImportDialog.DocumentExportPath, bDoenable)
+&apos; bDoEnable = CheckControlPath(ImportDialog.DocumentExportPath, bDoenable)
End Select
ImportDialog.cbGoOn.Enabled = bDoEnable
End Sub
@@ -222,14 +223,16 @@ End Sub
Sub TakeOverPathSettings()
&apos;Takes over the Pathsettings from the first selected application to the next applications
- Applications(CurOffice,SBDOCSOURCE) = Applications(0,SBDOCSOURCE)
- Applications(CurOffice,SBDOCTARGET) = Applications(0,SBDOCTARGET)
- If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY) = 3 Then &apos; Helper Applications
- Applications(CurOffice,SBTEMPLSOURCE) = Applications(CurOffice,SBDOCSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) = Applications(CurOffice,SBDOCTARGET)
- Else
- Applications(CurOffice,SBTEMPLSOURCE) = Applications(0,SBTEMPLSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET)
+ If Applications(CurOffice,SBDOCSOURCE) = &quot;&quot; Then
+ Applications(CurOffice,SBDOCSOURCE) = Applications(0,SBDOCSOURCE)
+ Applications(CurOffice,SBDOCTARGET) = Applications(0,SBDOCTARGET)
+ If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY) = 3 Then
+ Applications(CurOffice,SBTEMPLSOURCE) = Applications(CurOffice,SBDOCSOURCE)
+ Applications(CurOffice,SBTEMPLTARGET) = Applications(CurOffice,SBDOCTARGET)
+ Else
+ Applications(CurOffice,SBTEMPLSOURCE) = Applications(0,SBTEMPLSOURCE)
+ Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET)
+ End If
End If
-End Sub
+End Sub
</script:module> \ No newline at end of file