[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/dialog.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e66c9aa362c1e8729d76090023960610321b14f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 1 16:23:20 2017 +0100

    Related: tdf#112063 unsetting and resetting gtk modality is a problem
    
    for gtk3, so just set it on execute and no need to unset and reset it
    for whatever vcl nuttiness the existing code is doing
    
    Change-Id: I38a3124fb06f71d2e01d86f8b2c461fd625bba56
    Reviewed-on: https://gerrit.libreoffice.org/41805
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 7ee245c024a2..e4aac9dbf322 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -815,7 +815,8 @@ bool Dialog::ImplStartExecuteModal()
         GetParent()->CompatNotify( aNEvt );
     }
     mbInExecute = true;
-    SetModalInputMode( true );
+    ImplGetFrame()->SetModal(true);
+    SetModalInputMode(true);
 
     // FIXME: no layouting, workaround some clipping issues
     ImplAdjustNWFSizes();
@@ -945,7 +946,8 @@ void Dialog::EndDialog( long nResult )
 {
     if ( mbInExecute )
     {
-        SetModalInputMode( false );
+        SetModalInputMode(false);
+        ImplGetFrame()->SetModal(false);
 
         // remove dialog from the list of dialogs which are being executed
         ImplSVData* pSVData = ImplGetSVData();
@@ -1085,7 +1087,6 @@ void Dialog::SetModalInputMode( bool bModal )
             }
         }
     }
-    ImplGetFrame()->SetModal(bModal);
 }
 
 void Dialog::GrabFocusToFirstControl()