From f8e06f7b77a6286d2c41bbc76f06a768c76cd87a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 23 Oct 2018 10:38:03 +0100 Subject: weld AdvancedSettingsDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit make run virtual and fold executes into it, so GenericUnoDialog can call run on tabdialogs to do the right thing, and allows Start_Impl to be private again Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42 Reviewed-on: https://gerrit.libreoffice.org/62227 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dbaccess/source/ui/browser/genericcontroller.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dbaccess/source/ui/browser') diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 8baf8a5693ba..2e660ccb204d 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -931,7 +931,7 @@ void OGenericUnoController::clearView() void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo) { - ::dbaui::showError(_rInfo,getView(),getORB()); + ::dbtools::showError(_rInfo,VCLUnoHelper::GetInterface(getView()),getORB()); } Reference< XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 4726dd8c58f6..01603fa72e8e 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1445,7 +1445,7 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) if (m_pMasterListener) m_pMasterListener->AfterDrop(); Show(); - ::dbaui::showError( ::dbtools::SQLExceptionInfo(e), this, getContext() ); + ::dbtools::showError( ::dbtools::SQLExceptionInfo(e), VCLUnoHelper::GetInterface(this), getContext() ); } catch(const Exception& ) { -- cgit