summaryrefslogtreecommitdiff
path: root/svtools
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 /svtools
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 'svtools')
-rw-r--r--svtools/source/dialogs/prnsetup.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 5d415c32645d..31af8385e797 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -314,7 +314,7 @@ IMPL_LINK(PrinterSetupDialog, ImplDataChangedHdl, VclSimpleEvent&, rEvt, void)
ImplSetInfo();
}
-short PrinterSetupDialog::execute()
+short PrinterSetupDialog::run()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
{
@@ -329,7 +329,7 @@ short PrinterSetupDialog::execute()
maStatusTimer.Start();
// start dialog
- short nRet = m_xDialog->run();
+ short nRet = GenericDialogController::run();
// update data if the dialog was terminated with OK
if ( nRet == RET_OK )