diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-04 14:16:43 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-05 06:39:09 +0000 |
commit | cedbc4031f26ea13b188a4ecc5b90cc9646095fb (patch) | |
tree | 89cf1e537891e91fd4904211b72b471832280c33 /sc/source/ui/attrdlg/scdlgfact.cxx | |
parent | 156f778593ca9c57845076a88c6b544a63e12e7a (diff) |
tdf#106868: fix crash when modify external link
The EndDialog callback Hdl was disposing the Dialog, which is a little
troublesome since the stack wants to go back through the Dialog code
when the callback is done.
Rather just the more normal synchronous Execute() style of Dialog
execute, instead of the asynchronous StartExecuteModal.
Change-Id: I14933bd475da228c9648a6fa0564bda4a60d9d12
Reviewed-on: https://gerrit.libreoffice.org/36074
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/attrdlg/scdlgfact.cxx')
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index cfefb627df5e..61efb1bb4be4 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -90,7 +90,6 @@ IMPL_ABSTDLG_BASE(AbstractScInsertCellDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl); -IMPL_ABSTDLG2_BASE(AbstractScLinkedAreaDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScMetricInputDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScMoveTableDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScNameCreateDlg_Impl); @@ -110,6 +109,14 @@ IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl); IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl); +AbstractScLinkedAreaDlg_Impl::~AbstractScLinkedAreaDlg_Impl() +{ +} +short AbstractScLinkedAreaDlg_Impl::Execute() +{ + return pDlg->Execute(); +} + void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); |