[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/dbgui/PivotLayoutDialog.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b7eef4e6242d8ef803d1789cf1c44e2f8bc9ceee
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 27 15:59:56 2020 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Oct 29 11:52:48 2020 +0100

    tdf#137726 hide pivot table dlg so its not a candidate as error dlg parent
    
    because this pivot table dialog is going to disappear on response and the error
    dialog is not run in its own event loop but instead async so will end up as a
    parent of a dialog that doesn't exist
    
    Change-Id: I78302428a246612e3107d2907ffffb97a2d25ea2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104841
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 294771e955be..788e81574810 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -628,6 +628,12 @@ void ScPivotLayoutDialog::Close()
 
 IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, weld::Button&, void )
 {
+    /* tdf#137726 hide so its not a candidate to be parent of any error
+       messages that may appear because this dialog is going to disappear on
+       response(RET_OK) and the error dialog is not run in its own event loop
+       but instead async */
+    m_xDialog->hide();
+
     ApplyChanges();
     m_xDialog->response(RET_OK);
 }