summaryrefslogtreecommitdiff
path: root/sfx2/source/view/viewprn.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 /sfx2/source/view/viewprn.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 'sfx2/source/view/viewprn.cxx')
-rw-r--r--sfx2/source/view/viewprn.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index da95bc54b9f3..3dd70f6d83e2 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -447,7 +447,7 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute, weld::Button&, void)
SfxPrintOptionsDialog aDlg(_rSetupParent.GetFrameWeld(), _pViewSh, _pOptions.get() );
if (_bHelpDisabled)
aDlg.DisableHelp();
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
{
_pOptions = aDlg.GetOptions().Clone();
}
@@ -834,7 +834,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
}
aPrintSetupDlg.SetPrinter( pDlgPrinter );
- nDialogRet = aPrintSetupDlg.execute();
+ nDialogRet = aPrintSetupDlg.run();
if ( pExecutor && pExecutor->GetOptions() )
{