From 762f3a435bd66b1e530c7b46932dda2d2c3e4337 Mon Sep 17 00:00:00 2001 From: Behrend Cornelius Date: Mon, 15 Jul 2002 15:42:25 +0000 Subject: #96841# Cancel Button of Correspondence macro now of Cancel type --- wizards/source/template/Autotext.xba | 2 +- wizards/source/template/Correspondence.xba | 1 + wizards/source/template/DialogStyles.xdl | 26 +++++++++++++------------- wizards/source/template/ModuleAgenda.xba | 5 +---- wizards/source/template/Samples.xba | 2 +- wizards/source/template/TemplateDialog.xdl | 4 ++-- 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 @@ - Option Explicit +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 @@ - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + \ 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 @@ - ' All variables must be declared before use +' All variables must be declared before use Option Explicit ' Used for "disabling" the cancel button of the dialog @@ -77,9 +77,6 @@ End Sub ' 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 @@ - Option Explicit +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 @@ - + @@ -20,7 +20,7 @@ - + -- cgit