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>

7 files changed, 30 insertions, 35 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 475d59df9c63..b2c4f9364bc1 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-10-29 12:14:08 using:
+ Generated on 2019-12-01 19:53:21 using:
  ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -39,8 +39,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <o3tl/optional.hxx>
-#include <o3tl/optional.hxx>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #endif // PCH_LEVEL >= 1
@@ -108,7 +106,6 @@
 #include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/waitobj.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
@@ -261,6 +258,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/deleter.hxx>
+#include <o3tl/optional.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <officecfg/Office/Impress.hxx>
@@ -309,7 +307,6 @@
 #include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
 #include <svl/macitem.hxx>
-#include <svl/metitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/srchitem.hxx>
@@ -384,7 +381,9 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlnedit.hxx>
+#include <svx/xlnedwit.hxx>
 #include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xtable.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index a2b3a8cefb3c..eff5ad6cba92 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -32,7 +32,6 @@
 #include <sfx2/strings.hrc>
 
 #include <tools/debug.hxx>
-#include <vcl/waitobj.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svx/svdograf.hxx>
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 6a5cdc0965a7..e9e68c8ee706 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <editeng/outlobj.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/waitobj.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/editeng.hxx>
 #include <editeng/editstat.hxx>
@@ -346,9 +345,9 @@ bool DrawDocShell::Load( SfxMedium& rMedium )
  */
 bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
 {
-    std::unique_ptr<WaitObject> pWait;
+    std::unique_ptr<weld::WaitObject> pWait;
     if( mpViewShell )
-        pWait.reset(new WaitObject( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) ));
+        pWait.reset(new weld::WaitObject(mpViewShell->GetFrameWeld()));
 
     mpDoc->NewOrLoadCompleted( NEW_DOC );
     mpDoc->CreateFirstPages();
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index f3aec09ba703..f8cfa6a1ffe2 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <fucon3d.hxx>
-#include <vcl/waitobj.hxx>
 
 #include <svx/svxids.hrc>
 #include <sfx2/dispatch.hxx>
@@ -33,6 +32,8 @@
 #include <svx/camera3d.hxx>
 #include <svx/def3d.hxx>
 
+#include <vcl/weld.hxx>
+
 #include <app.hrc>
 
 #include <View.hxx>
@@ -326,7 +327,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
         mpWindow->CaptureMouse();
         sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
 
-        WaitObject aWait( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) );
+        weld::WaitObject aWait(mpViewShell->GetFrameWeld());
 
         E3dCompoundObject* p3DObj = ImpCreateBasic3DShape();
         E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj);
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 1760454d5fe9..46988c5f435f 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svdogrp.hxx>
@@ -343,7 +342,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
                 else
                 {
                     // wait-mousepointer while deleting object
-                    WaitObject aWait( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) );
+                    weld::WaitObject aWait(mpViewShell->GetFrameWeld());
                     // delete object
                     mpView->DeleteMarked();
                 }
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index a31599291056..233d4a108135 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -98,7 +98,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp2.hxx>
-#include <vcl/waitobj.hxx>
 #include <vcl/weld.hxx>
 
 #include <editeng/cmapitem.hxx>
@@ -1013,7 +1012,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             {
                 if( rReq.GetSlot() == SID_CHANGEBEZIER )
                 {
-                    WaitObject aWait( GetActiveWindow() );
+                    weld::WaitObject aWait(GetFrameWeld());
                     mpDrawView->ConvertMarkedToPathObj(false);
                 }
                 else
@@ -1024,7 +1023,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     }
                     else
                     {
-                        WaitObject aWait( GetActiveWindow() );
+                        weld::WaitObject aWait(GetFrameWeld());
                         mpDrawView->ConvertMarkedToPolyObj();
                     }
                 }
@@ -1058,7 +1057,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->ConvertMarkedToPathObj(true);
 
                 Invalidate(SID_CONVERT_TO_CONTOUR);
@@ -1088,7 +1087,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
 
                 // create SdrGrafObj from metafile/bitmap
                 Graphic aGraphic;
@@ -2690,7 +2689,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->CombineMarkedTextObjects();
             }
             Cancel();
@@ -2713,7 +2712,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->CombineMarkedObjects(false);
             }
             Cancel();
@@ -2754,7 +2753,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->MergeMarkedObjects(SdrMergeMode::Merge);
             }
             Cancel();
@@ -2777,7 +2776,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->MergeMarkedObjects(SdrMergeMode::Subtract);
             }
             Cancel();
@@ -2800,7 +2799,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->MergeMarkedObjects(SdrMergeMode::Intersect);
             }
             Cancel();
@@ -2825,7 +2824,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         {
             if ( mpDrawView->IsDismantlePossible() )
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->DismantleMarkedObjects();
             }
             Cancel();
@@ -2844,7 +2843,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             }
             else
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->CombineMarkedObjects();
             }
             Cancel();
@@ -2861,17 +2860,17 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
             if ( mpDrawView->IsBreak3DObjPossible() )
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->Break3DObj();
             }
             else if ( mpDrawView->IsDismantlePossible(true) )
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 mpDrawView->DismantleMarkedObjects(true);
             }
             else if ( mpDrawView->IsImportMtfPossible() )
             {
-                WaitObject aWait( GetActiveWindow() );
+                weld::WaitObject aWait(GetFrameWeld());
                 const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
                 const size_t nCnt=rMarkList.GetMarkCount();
 
@@ -2939,7 +2938,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                         mpDrawView->SdrEndTextEdit();
                     }
 
-                    WaitObject aWait( GetActiveWindow() );
+                    weld::WaitObject aWait(GetFrameWeld());
                     mpDrawView->ConvertMarkedObjTo3D();
                 }
             }
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 7ba9914706a7..45d5e1bc2a43 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -29,7 +29,6 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
-#include <vcl/waitobj.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/outlobj.hxx>
 #include <vcl/svapp.hxx>
@@ -340,7 +339,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
                         if (xQueryBox->run() == RET_YES )
                         {
                             // implicit transformation into bezier
-                            WaitObject aWait( GetActiveWindow() );
+                            weld::WaitObject aWait(GetFrameWeld());
                             mpDrawView->ConvertMarkedToPathObj(false);
                         }
                     }
@@ -383,7 +382,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
                         if (xQueryBox->run() == RET_YES)
                         {
                             // implicit transformation into bezier
-                            WaitObject aWait( GetActiveWindow() );
+                            weld::WaitObject aWait(GetFrameWeld());
                             mpDrawView->ConvertMarkedToPathObj(false);
                         }
                     }
@@ -860,7 +859,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
         case SID_PASTE:
         {
-            WaitObject aWait( GetActiveWindow() );
+            weld::WaitObject aWait(GetFrameWeld());
 
             if(HasCurrentFunction())
             {
@@ -918,7 +917,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
         case SID_PASTE_UNFORMATTED:
         {
-            WaitObject aWait( GetActiveWindow() );
+            weld::WaitObject aWait(GetFrameWeld());
 
             if(HasCurrentFunction())
             {
@@ -942,7 +941,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
         case SID_CLIPBOARD_FORMAT_ITEMS:
         {
-            WaitObject              aWait( GetActiveWindow() );
+            weld::WaitObject aWait(GetFrameWeld());
             TransferableDataHelper  aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) );
             const SfxItemSet*       pReqArgs = rReq.GetArgs();
             SotClipboardFormatId    nFormat = SotClipboardFormatId::NONE;