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

[Caolán McNamara (via logerrit)]

 forms/source/runtime/formoperations.cxx |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 48a676a1639f9c8aef734c47b457108d1712b79d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Dec 1 20:11:44 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 2 09:53:01 2019 +0100

    use weld::WaitObject with an explicit target
    
    Change-Id: I5ef322e4c17a1d643fa39968c92a39cf614ce23f
    Reviewed-on: https://gerrit.libreoffice.org/84168
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 01107afd7e2c..7112a46b118f 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -53,7 +53,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/waitobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/container.hxx>
 #include <comphelper/property.hxx>
@@ -607,7 +606,7 @@ namespace frm
             case FormFeature::ReloadForm:
                 if ( m_xLoadableForm.is() )
                 {
-                    WaitObject aWO( nullptr );
+                    weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
                     m_xLoadableForm->reload();
 
                     // refresh all controls in the form (and sub forms) which can be refreshed
@@ -734,7 +733,7 @@ namespace frm
                     aValues[1] <<= OUString();
                     aValues[2] <<= OUString();
 
-                    WaitObject aWO( nullptr );
+                    weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
                     xProperties->setPropertyValues( aNames, aValues );
 
                     if ( m_xLoadableForm.is() )
@@ -752,7 +751,7 @@ namespace frm
                     m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( !bApplied ) );
 
                     // and reload
-                    WaitObject aWO( nullptr );
+                    weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
                     m_xLoadableForm->reload();
                 }
                 break;
@@ -1557,7 +1556,7 @@ namespace frm
             impl_appendOrderByColumn_throw aAction(this, xBoundField, _bUp);
             impl_doActionInSQLContext_throw(aAction, RID_STR_COULD_NOT_SET_ORDER );
 
-            WaitObject aWO( nullptr );
+            weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
             try
             {
                 m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) );
@@ -1628,7 +1627,7 @@ namespace frm
             impl_appendFilterByColumn_throw aAction(this, m_xParser, xBoundField);
             impl_doActionInSQLContext_throw( aAction, RID_STR_COULD_NOT_SET_FILTER );
 
-            WaitObject aWO( nullptr );
+            weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
             try
             {
                 m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       makeAny( m_xParser->getFilter() ) );
@@ -1715,7 +1714,7 @@ namespace frm
 
             if ( RET_OK == xDialog->execute() )
             {
-                WaitObject aWO( nullptr );
+                weld::WaitObject aWO(Application::GetFrameWeld(xDialogParent));
                 if ( _bFilter )
                 {
                     m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       makeAny( m_xParser->getFilter() ) );