diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-09 15:24:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-09 20:54:56 +0200 |
| commit | 4db804df44b1b4cb9512e02aaac8d45e986a03eb (patch) | |
| tree | b0f810f62eb121f3e1f15eb4f6252d42563fa61f /sc | |
| parent | ce98bef935dccd79735615a9299b2aa7a1ab0b94 (diff) | |
enable set_busy_cursor to stack up in the gtk version too
Change-Id: Ib9f8ee5af3e40c7563561d0eebc59f4a4fafcfa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113888
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 43021d09c02d..6182277d3833 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -38,7 +38,6 @@ #include <svx/svdview.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/waitobj.hxx> #include <osl/diagnose.h> #include <viewfunc.hxx> @@ -895,8 +894,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat } // Insert via PasteFromClip - - WaitObject aWait( GetFrameWin() ); + weld::WaitObject aWait(GetViewData().GetDialogParent()); ScAddress aPos( nCol, nRow, nTab ); @@ -2347,7 +2345,7 @@ void ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - WaitObject aWait( GetFrameWin() ); + weld::WaitObject aWait(GetViewData().GetDialogParent()); if (bRecord) { @@ -2388,7 +2386,7 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - WaitObject aWait( GetFrameWin() ); + weld::WaitObject aWait(GetViewData().GetDialogParent()); if (bRecord) rDoc.BeginDrawUndo(); // InsertTab creates a SdrUndoNewPage @@ -2435,7 +2433,7 @@ void ScViewFunc::DeleteTables( const SCTAB nTab, SCTAB nSheets ) ScDocument& rDoc = pDocSh->GetDocument(); bool bVbaEnabled = rDoc.IsInVBAMode(); SCTAB nNewTab = nTab; - WaitObject aWait( GetFrameWin() ); + weld::WaitObject aWait(GetViewData().GetDialogParent()); while ( nNewTab > 0 && !rDoc.IsVisible( nNewTab ) ) --nNewTab; @@ -2474,7 +2472,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) ScDocument& rDoc = pDocSh->GetDocument(); bool bVbaEnabled = rDoc.IsInVBAMode(); SCTAB nNewTab = TheTabs.front(); - WaitObject aWait( GetFrameWin() ); + weld::WaitObject aWait(GetViewData().GetDialogParent()); if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; if ( bVbaEnabled ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index bef26c640673..e772f906303f 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -34,7 +34,6 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/virdev.hxx> -#include <vcl/waitobj.hxx> #include <stdlib.h> #include <unotools/charclass.hxx> #include <vcl/uitest/logger.hxx> @@ -1830,7 +1829,7 @@ void ScViewFunc::DeleteMulti( bool bRows ) // proceed - WaitObject aWait( GetFrameWin() ); // important for TrackFormulas in UpdateReference + weld::WaitObject aWait(GetViewData().GetDialogParent()); // important for TrackFormulas in UpdateReference ResetAutoSpellForContentChange(); |