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 /sfx2/source/dialog | |
| 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 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/passwd.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/securitypage.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 497deca9ccb7..ea859cad9a22 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -150,7 +150,7 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow) m_xMinLengthFT->show(bShow); } -short SfxPasswordDialog::execute() +short SfxPasswordDialog::run() { m_xUserFT->hide(); m_xUserED->hide(); @@ -188,7 +188,7 @@ short SfxPasswordDialog::execute() m_xConfirm2ED->show(); } - return m_xDialog->run(); + return GenericDialogController::run(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index d04d2166a686..19fecc8be22a 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -99,7 +99,7 @@ static bool lcl_GetPassword( aPasswdDlg.SetMinLen(1); if (bProtect) aPasswdDlg.ShowExtras( SfxShowExtras::CONFIRM ); - if (RET_OK == aPasswdDlg.execute() && !aPasswdDlg.GetPassword().isEmpty()) + if (RET_OK == aPasswdDlg.run() && !aPasswdDlg.GetPassword().isEmpty()) { rPassword = aPasswdDlg.GetPassword(); bRes = true; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 37df9f36e67b..ae9a9cbfd0da 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -2161,10 +2161,10 @@ OString SfxTabDialogController::GetCurPageId() const return m_xTabCtrl->get_current_page_ident(); } -short SfxTabDialogController::execute() +short SfxTabDialogController::run() { Start_Impl(); - return m_xDialog->run(); + return SfxDialogController::run(); } bool SfxTabDialogController::runAsync(const std::shared_ptr<SfxTabDialogController>& rController, |