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/querydesign/JoinTableView.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dbaccess/source/ui/querydesign/JoinTableView.cxx') diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 5e46b34afbca..51fd3d9ea4f5 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -289,14 +289,14 @@ TTableWindowData::value_type OJoinTableView::createTableWindowData(const OUStrin } catch ( const SQLException& ) { - ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), - pParent, pParent->getController().getORB() ); + ::dbtools::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), + VCLUnoHelper::GetInterface(pParent), pParent->getController().getORB() ); } catch( const WrappedTargetException& e ) { SQLException aSql; if ( e.TargetException >>= aSql ) - ::dbaui::showError( ::dbtools::SQLExceptionInfo( aSql ), pParent, pParent->getController().getORB() ); + ::dbtools::showError( ::dbtools::SQLExceptionInfo( aSql ), VCLUnoHelper::GetInterface(pParent), pParent->getController().getORB() ); } catch( const Exception& ) { -- cgit