#96841# Cancel Button of Correspondence macro now of Cancel type

6 files changed, 19 insertions, 21 deletions

diff --git a/wizards/source/template/Autotext.xba b/wizards/source/template/Autotext.xba
index ad2affe14436..6bc34f98e197 100644
--- a/wizards/source/template/Autotext.xba
+++ b/wizards/source/template/Autotext.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="Autotext" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Autotext" script:language="StarBasic">Option Explicit
 
 Public UserfieldDataType(14) as String
 Public oDocAuto as Object
diff --git a/wizards/source/template/Correspondence.xba b/wizards/source/template/Correspondence.xba
index ca4de2b9d2f1..0f688cf46ea5 100644
--- a/wizards/source/template/Correspondence.xba
+++ b/wizards/source/template/Correspondence.xba
@@ -17,6 +17,7 @@ Sub Main
 	DialogModel.Optmerge.State = True
 	LoadLanguageCorrespondence()
 	TemplateDialog.Execute
+	TemplateDialog.Dispose()
 End Sub
 
 
diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl
index 81e025efc95c..82e24b6b8e4e 100644
--- a/wizards/source/template/DialogStyles.xdl
+++ b/wizards/source/template/DialogStyles.xdl
@@ -1,15 +1,15 @@
 <?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" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:34650">
-  <dlg:bulletinboard>
-   <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:34652" dlg:value="cmdCancel">
-    <script:event script:event-name="on-performaction" script:macro-name="Template.Samples.RestoreCurrentStyles" script:language="StarBasic"/>
-   </dlg:button>
-   <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:34653" dlg:value="cmdOk">
-    <script:event script:event-name="on-performaction" script:macro-name="Template.Samples.CloseStyleDialog" script:language="StarBasic"/>
-   </dlg:button>
-   <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:34651">
-    <script:event script:event-name="on-itemstatechange" script:macro-name="Template.Samples.SelectStyle" script:language="StarBasic"/>
-   </dlg:menulist>
-  </dlg:bulletinboard>
- </dlg:window>
\ No newline at end of file
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:34650" dlg:closeable="true" dlg:moveable="true">
+ <dlg:bulletinboard>
+  <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:34652" dlg:value="cmdCancel">
+   <script:event script:event-name="on-performaction" script:macro-name="Template.Samples.RestoreCurrentStyles" script:language="StarBasic"/>
+  </dlg:button>
+  <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:34653" dlg:value="cmdOk">
+   <script:event script:event-name="on-performaction" script:macro-name="Template.Samples.CloseStyleDialog" script:language="StarBasic"/>
+  </dlg:button>
+  <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:34651">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="Template.Samples.SelectStyle" script:language="StarBasic"/>
+  </dlg:menulist>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/wizards/source/template/ModuleAgenda.xba b/wizards/source/template/ModuleAgenda.xba
index 92737f2b35ee..8b32df4523f0 100644
--- a/wizards/source/template/ModuleAgenda.xba
+++ b/wizards/source/template/ModuleAgenda.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="ModuleAgenda" script:language="StarBasic">&apos; All variables must be declared before use
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ModuleAgenda" script:language="StarBasic">&apos; All variables must be declared before use
 Option Explicit
 
 &apos; Used for &quot;disabling&quot; the cancel button of the dialog
@@ -77,9 +77,6 @@ End Sub
 
 
 &apos; Attention This Sub is also called from the correspondence stuff
-Sub DisposeDocument
-  TemplateDialog.EndExecute
-End Sub
 
 
 Sub NewTopic
diff --git a/wizards/source/template/Samples.xba b/wizards/source/template/Samples.xba
index b42bc7bbc452..73e02bc35a74 100644
--- a/wizards/source/template/Samples.xba
+++ b/wizards/source/template/Samples.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="Samples" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Samples" script:language="StarBasic">Option Explicit
 
 Const SAMPLES = 1000
 Const STYLES = 1100
diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl
index d41f33d5c050..6394037e3b1b 100644
--- a/wizards/source/template/TemplateDialog.xdl
+++ b/wizards/source/template/TemplateDialog.xdl
@@ -1,6 +1,6 @@
 <?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" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:34630">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:34630" dlg:closeable="true" dlg:moveable="true">
  <dlg:bulletinboard>
   <dlg:radiogroup>
    <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:help-url="HID:34632" dlg:value="OptAgenda1">
@@ -20,7 +20,7 @@
   <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:help-url="HID:34634" dlg:value="CmdAgdGoOn">
    <script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.ModifyTemplate" script:language="StarBasic"/>
   </dlg:button>
-  <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:34631" dlg:value="CmdCancel">
+  <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:34631" dlg:value="CmdCancel" dlg:button-type="cancel">
    <script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.DisposeDocument" script:language="StarBasic"/>
   </dlg:button>
   <dlg:fixedline dlg:id="FrmLetter" dlg:tab-index="7" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="2" dlg:value="FrmLetter"/>