use weld::WaitObject

Change-Id: Ib2ad0f0fe17c4db66693ef91e3cdbc8511eb8314
Reviewed-on: https://gerrit.libreoffice.org/84166
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 5 insertions, 9 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 818b423a205b..4c74fad173d6 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -89,7 +89,6 @@
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/waitobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -634,7 +633,7 @@ void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLEx
 
 bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoadable )
 {
-    WaitObject aWO(getBrowserView());
+    weld::WaitObject aWO(getFrameWeld());
 
     onStartLoading( _rxLoadable );
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index a5dc5e061720..81dfef0f840c 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -47,7 +47,6 @@
 #include <sfx2/sidebar/UnoSidebar.hxx>
 #include <sfx2/userinputinterception.hxx>
 
-#include <vcl/waitobj.hxx>
 #include <svl/urihelper.hxx>
 #include <datasourceconnector.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -899,7 +898,7 @@ void OGenericUnoController::stopConnectionListening(const Reference< XConnection
 
 Reference< XConnection > OGenericUnoController::connect( const Reference< XDataSource>& _xDataSource )
 {
-    WaitObject aWaitCursor( getView() );
+    weld::WaitObject aWaitCursor(getFrameWeld());
 
     ODatasourceConnector aConnector( getORB(), getFrameWeld(), OUString() );
     Reference< XConnection > xConnection = aConnector.connect( _xDataSource, nullptr );
@@ -911,7 +910,7 @@ Reference< XConnection > OGenericUnoController::connect( const Reference< XDataS
 Reference< XConnection > OGenericUnoController::connect( const OUString& _rDataSourceName,
     const OUString& _rContextInformation, ::dbtools::SQLExceptionInfo* _pErrorInfo )
 {
-    WaitObject aWaitCursor( getView() );
+    weld::WaitObject aWaitCursor(getFrameWeld());
 
     ODatasourceConnector aConnector( getORB(), getFrameWeld(), _rContextInformation );
     Reference<XConnection> xConnection = aConnector.connect( _rDataSourceName, _pErrorInfo );
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 43655259bc06..a47db2b688e9 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -63,7 +63,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
 
 #include <svl/zforlist.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 2b33bd6ded7b..baf3d3cd2719 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -127,7 +127,6 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 
 #include <memory>
@@ -2131,7 +2130,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool)
 
     if (etTableContainer == pData->eType)
     {
-        WaitObject aWaitCursor(getBrowserView());
+        weld::WaitObject aWaitCursor(getFrameWeld());
 
         // it could be that we already have a connection
         SharedConnection xConnection;
@@ -2534,7 +2533,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
     {
         try
         {
-            WaitObject aWaitCursor(getBrowserView());
+            weld::WaitObject aWaitCursor(getFrameWeld());
 
             // tell the old entry it has been deselected
             selectPath(m_pCurrentlyDisplayed, false);