diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 10:38:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 11:55:01 +0200 |
| commit | f8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch) | |
| tree | 0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /dbaccess/source/ui/browser | |
| parent | b85ff98383942360901b8242cf77366782400426 (diff) | |
weld AdvancedSettingsDialog
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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& ) { |