From 9711e8ed4c7353e453aa5a9b59187f6cd31f24f1 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 19 Jul 2019 08:16:54 +0200 Subject: tdf#126471 Apply selected MM printer on dialog open Calling 'PrinterChangeHdl_Impl' in 'SwMMResultPrintDialog::FillInPrinterSettings' makes sure that a preselected printer is actually taken into account (i.e. 'm_pTempPrinter' set accordingly etc.) as soon as the dialog is created, not only when explicitly selecting another printer. Since 'PrinterChangeHdl_Impl' is now called initially and every time another printer is selected, there's no more need to do so in 'PrinterSetupHdl_Impl' any more. This fixes the issue that printout would always happen on default printer instead of the preselected one when SwMMResultPrintDialog was opened a second time. Change-Id: I5c930ed56d1025a7e94cc98fb70c01612bda0d22 Reviewed-on: https://gerrit.libreoffice.org/75933 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit 0f0adc34889ff68da584cea97a9de649174b0333) Reviewed-on: https://gerrit.libreoffice.org/75968 Reviewed-by: Michael Stahl --- sw/source/ui/dbui/mmresultdialogs.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sw') diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index b7b55baca56c..d102faec4103 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -341,6 +341,7 @@ void SwMMResultPrintDialog::FillInPrinterSettings() { m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter()); } + PrinterChangeHdl_Impl(*m_xPrinterLB); sal_Int32 count = xConfigItem->GetMergedDocumentCount(); m_xToNF->set_value(count); @@ -782,8 +783,6 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl, weld::Button&, void) IMPL_LINK_NOARG(SwMMResultPrintDialog, PrinterSetupHdl_Impl, weld::Button&, void) { - if (!m_pTempPrinter) - PrinterChangeHdl_Impl(*m_xPrinterLB); if (m_pTempPrinter) m_pTempPrinter->Setup(m_xDialog.get()); } -- cgit