summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/UserAdmin.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-23 10:38:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-24 11:55:01 +0200
commitf8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch)
tree0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /dbaccess/source/ui/dlg/UserAdmin.cxx
parentb85ff98383942360901b8242cf77366782400426 (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/dlg/UserAdmin.cxx')
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 74a1db8723f1..c35e2033c52d 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -203,7 +203,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
{
SfxPasswordDialog aPwdDlg(GetFrameWeld());
aPwdDlg.ShowExtras(SfxShowExtras::ALL);
- if (aPwdDlg.execute())
+ if (aPwdDlg.run())
{
Reference<XDataDescriptorFactory> xUserFactory(m_xUsers,UNO_QUERY);
Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor();
@@ -259,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
}
catch(const SQLException& e)
{
- ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
+ ::dbtools::showError(::dbtools::SQLExceptionInfo(e), VCLUnoHelper::GetInterface(this), m_xORB);
}
catch(Exception& )
{
@@ -316,7 +316,7 @@ void OUserAdmin::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
}
catch(const SQLException& e)
{
- ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
+ ::dbtools::showError(::dbtools::SQLExceptionInfo(e), VCLUnoHelper::GetInterface(this), m_xORB);
}
OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);