diff options
37 files changed, 70 insertions, 101 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 9a8df0d70505..841f3eb7e6b5 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.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-17 15:14:30 using: + Generated on 2019-12-01 19:37:49 using: ./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -34,19 +34,18 @@ #include <string_view> #include <utility> #include <vector> -#include <o3tl/optional.hxx> +#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/ptree.hpp> +#include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> -#include <osl/security.h> #include <osl/thread.hxx> #include <rtl/bootstrap.hxx> #include <rtl/instance.hxx> -#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/process.h> #include <rtl/ref.hxx> @@ -83,7 +82,6 @@ #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclreferencebase.hxx> -#include <vcl/waitobj.hxx> #include <vcl/wall.hxx> #include <vcl/weld.hxx> #endif // PCH_LEVEL >= 2 diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 52bcae8d53bd..f7dc6d0bfad9 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -46,7 +46,6 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> #include <connectivity/dbexception.hxx> -#include <vcl/waitobj.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include "AppView.hxx" @@ -332,7 +331,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL return m_xDataSourceConnection; } - WaitObject aWO(getView()); + weld::WaitObject aWO(getFrameWeld()); Reference<XConnection> conn; { SolarMutexGuard aSolarGuard; @@ -499,7 +498,7 @@ std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAc } std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( - getView(), this, getORB(), xDocContainer, xConnection, getDatabaseName() + getFrameWeld(), this, getORB(), xDocContainer, xConnection, getDatabaseName() ) ); return pDocuments; } diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 9c2ad5dbb748..db32b9a15d8e 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -65,7 +65,6 @@ #include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/waitobj.hxx> #include <osl/mutex.hxx> namespace dbaui @@ -162,7 +161,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - WaitObject aWO(getView()); + weld::WaitObject aWO(getFrameWeld()); Sequence< Any > aArgs(3); sal_Int32 nArgPos = 0; @@ -220,7 +219,7 @@ void OApplicationController::refreshTables() { if ( getContainer() && getContainer()->getDetailView() ) { - WaitObject aWO(getView()); + weld::WaitObject aWO(getFrameWeld()); OSL_ENSURE(getContainer()->getElementType() == E_TABLE,"Only allowed when the tables container is selected!"); try { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 9e3f52215737..92edb0825656 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -59,7 +59,6 @@ #include <databaseobjectview.hxx> #include <imageprovider.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <vcl/event.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -727,7 +726,7 @@ DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const OString& _sHelpId, DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage ) { - WaitObject aWaitCursor(this); + weld::WaitObject aWaitCursor(GetFrameWeld()); _pTreeView->SetStyle(_pTreeView->GetStyle() | WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); _pTreeView->GetModel()->SetSortMode(SortAscending); @@ -1004,7 +1003,7 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent) { m_pTablePreview->Hide(); - WaitObject aWaitCursor( this ); + weld::WaitObject aWaitCursor(GetFrameWeld()); try { Reference<XCommandProcessor> xContent(_xContent,UNO_QUERY); @@ -1065,7 +1064,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, { if ( isPreviewEnabled() ) { - WaitObject aWaitCursor( this ); + weld::WaitObject aWaitCursor(GetFrameWeld()); m_aPreview->Hide(); m_aDocumentInfo->Hide(); m_pTablePreview->Show(); diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 00cbb0e4ef65..bbd9891683c3 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -24,7 +24,6 @@ #include <vcl/toolbox.hxx> #include <vcl/event.hxx> #include <unotools/configmgr.hxx> -#include <vcl/waitobj.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -434,7 +433,7 @@ void OApplicationView::clearPages() void OApplicationView::selectContainer(ElementType _eType) { OSL_ENSURE(m_pWin && getPanel(),"Detail view is NULL! -> GPF"); - WaitObject aWO(this); + weld::WaitObject aWO(GetFrameWeld()); getPanel()->selectContainer(_eType); } 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); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 35ab382c40fa..39f57338f48f 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -24,13 +24,17 @@ #include "RelationDesignView.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -class WaitObject; +namespace weld +{ + class WaitObject; +} + namespace dbaui { class ORelationController : public OJoinController { css::uno::Reference< css::container::XNameAccess > m_xTables; - std::unique_ptr<WaitObject> m_pWaitObject; + std::unique_ptr<weld::WaitObject> m_xWaitObject; sal_uLong m_nThreadEvent; bool m_bRelationsPossible; protected: diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 697dacb33ac9..0e1ca710429b 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -30,9 +30,8 @@ #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <vcl/vclptr.hxx> -namespace vcl { class Window; } +namespace weld { class Window; } namespace dbaui { @@ -47,12 +46,12 @@ namespace dbaui m_xConnection; css::uno::Reference< css::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - VclPtr<vcl::Window> m_pDialogParent; + weld::Window* m_pDialogParent; OUString m_sDataSourceName; public: OLinkedDocumentsAccess( - vcl::Window* _pDialogParent, + weld::Window* pDialogParent, const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const css::uno::Reference< css::container::XNameAccess >& _rxContainer, diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 135632e0c698..d3848766916a 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -51,7 +51,6 @@ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> -#include <vcl/waitobj.hxx> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <unotools/tempfile.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 6c0ba95365e1..1e3a97193fc1 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -47,7 +47,6 @@ #include <svtools/ehdl.hxx> #include <svx/dataaccessdescriptor.hxx> #include <com/sun/star/container/XHierarchicalNameContainer.hpp> -#include <vcl/waitobj.hxx> #include <comphelper/mimeconfighelper.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -100,18 +99,18 @@ namespace dbaui } // OLinkedDocumentsAccess - OLinkedDocumentsAccess::OLinkedDocumentsAccess( vcl::Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, + OLinkedDocumentsAccess::OLinkedDocumentsAccess( weld::Window* pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer, const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName ) :m_xContext(_rxContext) ,m_xDocumentContainer(_rxContainer) ,m_xConnection(_xConnection) ,m_xDocumentUI( i_rDocumentUI ) - ,m_pDialogParent(_pDialogParent) + ,m_pDialogParent(pDialogParent) ,m_sDataSourceName(_sDataSourceName) { OSL_ENSURE(m_xContext.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!"); - OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); + assert(m_pDialogParent && "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); } OLinkedDocumentsAccess::~OLinkedDocumentsAccess() { @@ -125,7 +124,7 @@ namespace dbaui if ( !xComponentLoader.is() ) return xRet; - WaitObject aWaitCursor( m_pDialogParent ); + weld::WaitObject aWaitCursor(m_pDialogParent); ::comphelper::NamedValueCollection aArguments; OUString sOpenMode; @@ -184,7 +183,7 @@ namespace dbaui Reference< XJobExecutor > xWizard; { - WaitObject aWaitCursor( m_pDialogParent ); + weld::WaitObject aWaitCursor(m_pDialogParent); xWizard.set( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( OUString::createFromAscii( _pWizardService ), aArgs.getWrappedPropertyValues(), @@ -291,7 +290,7 @@ namespace dbaui Command aCommand; aCommand.Name = "openDesign"; aCommand.Argument <<= aCommandArgs.getPropertyValues(); - WaitObject aWaitCursor( m_pDialogParent ); + weld::WaitObject aWaitCursor(m_pDialogParent); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), nullptr ), UNO_QUERY ); } } @@ -359,7 +358,7 @@ namespace dbaui } if (aInfo.isValid()) { - showError(aInfo, VCLUnoHelper::GetInterface(m_pDialogParent), m_xContext ); + showError(aInfo, m_pDialogParent->GetXWindow(), m_xContext); } return xRet; } diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index eae59834ce58..b2a5184ffc7c 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -43,7 +43,6 @@ #include <TableWindow.hxx> #include <TableConnectionData.hxx> #include <adtabdlg.hxx> -#include <vcl/waitobj.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <UITools.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index e3ec54717b89..530598ad09f5 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -63,7 +63,6 @@ #include <RelationDesignView.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <vcl/waitobj.hxx> #include <osl/thread.hxx> #include <osl/mutex.hxx> @@ -477,12 +476,12 @@ IMPL_LINK_NOARG( ORelationController, OnThreadFinished, void*, void ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); } - m_pWaitObject.reset(); + m_xWaitObject.reset(); } void ORelationController::loadData() { - m_pWaitObject.reset( new WaitObject(getView()) ); + m_xWaitObject.reset(new weld::WaitObject(getFrameWeld())); try { if ( !m_xTables.is() ) diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 0b81da69e191..e43cdec09891 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/form/XForm.hpp> #include <tools/fldunit.hxx> -#include <vcl/waitobj.hxx> #include <connectivity/dbtools.hxx> #include <set> 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); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 71507af7bce2..6ae0cb176dfd 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -20,7 +20,6 @@ #include <sfx2/app.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/waitobj.hxx> #include <svx/dataaccessdescriptor.hxx> #include <svx/svdpage.hxx> #include <svx/svdoole2.hxx> diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 3960e9daa596..caad14cffb01 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -25,7 +25,6 @@ #include <editeng/justifyitem.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> -#include <vcl/waitobj.hxx> #include <vcl/weld.hxx> #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7ae0f73b2e2d..689a257192bf 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -30,7 +30,6 @@ #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> -#include <vcl/waitobj.hxx> #include <vcl/weld.hxx> #include <rtl/bootstrap.hxx> #include <rtl/tencinfo.h> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index ced26c3261d2..bbe2bff7c845 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; #include <svl/whiter.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/waitobj.hxx> #include <svx/dataaccessdescriptor.hxx> #include <svx/drawitem.hxx> #include <svx/fmshell.hxx> diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index aee5cef5d0a4..c62350332204 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -25,7 +25,6 @@ #include <osl/diagnose.h> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index af7440c58a9d..d9f89078e6e6 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -19,7 +19,6 @@ #include <scitems.hxx> #include <vcl/virdev.hxx> -#include <vcl/waitobj.hxx> #include <editeng/boxitem.hxx> #include <sfx2/app.hxx> #include <comphelper/lok.hxx> diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 01944bcb3678..03755bc8c48d 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -31,7 +31,6 @@ #include <svl/itemset.hxx> #include <tools/multisel.hxx> #include <vcl/commandevent.hxx> -#include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <o3tl/deleter.hxx> @@ -211,7 +210,7 @@ void ScPreview::TestLastPage() void ScPreview::CalcPages() { - WaitObject aWait( this ); + weld::WaitObject aWait(GetFrameWeld()); ScDocument& rDoc = pDocShell->GetDocument(); nTabCount = rDoc.GetTableCount(); 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; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f5689b3c3584..261393529435 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -98,7 +98,6 @@ #include <vcl/weld.hxx> #include <ucbhelper/content.hxx> -#include <vcl/waitobj.hxx> #include <unotools/ucbhelper.hxx> #include <sfx2/viewfrm.hxx> @@ -581,7 +580,7 @@ namespace sfx2 { void IndexTabPage_Impl::InitializeIndex() { - WaitObject aWaitCursor( this ); + weld::WaitObject aWaitCursor(GetFrameWeld()); // By now more than 256 equal entries are not allowed sal_Unicode append[256]; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index ecebd52c1ed7..4223ce2d012c 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -37,7 +37,6 @@ #include <preview.hxx> #include <sfx2/printer.hxx> #include <unotools/viewoptions.hxx> -#include <vcl/waitobj.hxx> void SfxPreviewWin_Impl::SetObjectShell(SfxObjectShell const * pObj) { diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 5981c86c1dc1..b9edd4610ad1 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -24,7 +24,6 @@ #include <fmprop.hxx> #include <fmpgeimp.hxx> #include <fmundo.hxx> -#include <vcl/waitobj.hxx> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index b17a794c79ff..833fc55ff230 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -99,7 +99,6 @@ #include <tools/diagnose_ex.h> #include <vcl/image.hxx> #include <vcl/weld.hxx> -#include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> |