diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-12-09 07:48:01 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2015-12-10 08:25:01 +0000 |
| commit | cc5899ff62dd4e9c76aa456fe845c5812bb8d93a (patch) | |
| tree | efad005ef0ac8f03c8a19173a49bc50217a65ca7 /sw/source/uibase/dbui/mmconfigitem.cxx | |
| parent | c4c059beb39079c204dc35088edd587ce58eadc3 (diff) | |
tdf#94816: fixed some problems in the mail merge wizard
Some disposeAndClear have been added as calling dialogs in the wizard
like select address list, new address list, match fields crashed in
dbg build in shutdown because the dialogs were still alive.
The wizard is now deleted on Cancel which didn't work anymore.
The timeout of the preview control of page 5 has been changed
as the preview didn't even appear on Windows in a debug build
The timeout handler was called after the wizard has been closed and
lead to a crash.
Change-Id: I9cd01f39347744bda31a312f695d27eefa077721
Reviewed-on: https://gerrit.libreoffice.org/20489
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Tested-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'sw/source/uibase/dbui/mmconfigitem.cxx')
| -rw-r--r-- | sw/source/uibase/dbui/mmconfigitem.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index f78a85bc67e3..b576da35dde1 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -734,7 +734,8 @@ SwMailMergeConfigItem::SwMailMergeConfigItem() : {} SwMailMergeConfigItem::~SwMailMergeConfigItem() -{} +{ +} void SwMailMergeConfigItem::Commit() { |