diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-01 19:27:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-02 09:52:29 +0100 |
| commit | ea2aeb6917a04401f95bab7aac37f4d070e07128 (patch) | |
| tree | cdedaebbce1016b84ead350750c070e04fec3ac1 /reportdesign | |
| parent | 1d8a32f15b0895dcdd33331768fda50dd69cf8fc (diff) | |
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>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 6c7728ebc54d..1843e83e3424 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <vcl/event.hxx> -#include <vcl/waitobj.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 35dd83e3c717..db98aa57bdec 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -66,9 +66,9 @@ #include <com/sun/star/inspection/XNumericControl.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <vcl/waitobj.hxx> #include <tools/fldunit.hxx> #include <vcl/stdtext.hxx> +#include <vcl/svapp.hxx> #include <core_resource.hxx> #include <stringarray.hrc> @@ -2058,8 +2058,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF try { uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); - VclPtr<vcl::Window> pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow ); - WaitObject aWaitCursor( pInspectorWindow ); + weld::WaitObject aWaitCursor(Application::GetFrameWeld(xInspectorWindow)); // get the form of the control we're inspecting uno::Reference< beans::XPropertySet > xFormSet( m_xRowSet, uno::UNO_QUERY ); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 92481ac15918..133275e9f43d 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -77,7 +77,6 @@ #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <vcl/svapp.hxx> -#include <vcl/waitobj.hxx> #include <svx/fmview.hxx> #include <editeng/paperinf.hxx> @@ -1721,7 +1720,7 @@ void OReportController::impl_initialize( ) IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow& ,_rAddFieldDlg, void) { - WaitObject aObj( getDesignView() ); + weld::WaitObject aObj(getFrameWeld()); uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors(); // we use this way to create undo actions if ( aArgs.hasElements() ) @@ -2879,7 +2878,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() m_bInGeneratePreview = true; try { - WaitObject aWait(getView()); // cursor + weld::WaitObject aWait(getFrameWeld()); // cursor if ( !m_xReportEngine.is() ) m_xReportEngine.set( report::ReportEngine::create(m_xContext) ); m_xReportEngine->setReportDefinition(m_xReportDefinition); |