cui/uiconfig/ui/borderareatransparencydialog.ui | 1 + svx/source/dialog/hdft.cxx | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit daad7e238bdcd39c332e255fc4feeb49afb26de9 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Mar 2 11:22:49 2020 +0000 Commit: Aron Budea <[email protected]> CommitDate: Sun Aug 9 23:40:38 2020 +0200 Resolves: tdf#131041 crash on async border dialog Change-Id: Ia9f5f02a0993c3b28ca5fecef3ce6333ba85806b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89823 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit fd55510992800d18d04f3c54bd2ad0e0eb62d9ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100411 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Aron Budea <[email protected]> diff --git a/cui/uiconfig/ui/borderareatransparencydialog.ui b/cui/uiconfig/ui/borderareatransparencydialog.ui index 9e8ff3623d74..00957753639c 100644 --- a/cui/uiconfig/ui/borderareatransparencydialog.ui +++ b/cui/uiconfig/ui/borderareatransparencydialog.ui @@ -7,6 +7,7 @@ <property name="border_width">6</property> <property name="title" translatable="yes" context="borderareatransparencydialog|BorderAreaTransparencyDialog">Border / Background</property> <property name="resizable">False</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index b92dc46e8deb..82f815cf3625 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -619,12 +619,12 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( + VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( GetFrameWeld(), *pBBSet, mbEnableDrawingLayerFillStyles)); - pDlg->StartExecuteAsync([&](sal_Int32 nResult) { + pDlg->StartExecuteAsync([pDlg, this](sal_Int32 nResult) { if (nResult == RET_OK && pDlg->GetOutputItemSet()) { SfxItemIter aIter(*pDlg->GetOutputItemSet()); @@ -676,6 +676,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) } } } + pDlg->disposeOnce(); }); UpdateExample(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
