summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-07-19 08:27:57 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2019-07-22 11:34:32 +0200
commit8d4733df5ca12e92dbf5d5ac525fd4d8bf9307dd (patch)
treed35c5367fcefd68450b23cb29abc438b1cd3a198
parented9acbe6057f535bca8d4ce98aa0eda7be34e15b (diff)
Mail merge: Preselect proper printer
The proper printer has already been set a few lines above depending on the value of 'bMergePrinterExists', so it shouldn't be unconditionally overwritten here with a potentially invalid printer (using the same statement as already used 7 lines above for the 'else' case). This e.g. makes sure that the default printer is selected when no printer has been set, e.g. just after running Mail Merge Wizard on a new Writer doc, in which case no printer was selected previously. Change-Id: I922b8234be9c80536b6b0a9ba0dd19bdc39246e8 Reviewed-on: https://gerrit.libreoffice.org/75932 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 3bc1f99d3a792cdba037bcc757e8611d7e187b73) Reviewed-on: https://gerrit.libreoffice.org/75967 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index a103d4001023..b7b55baca56c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -345,8 +345,6 @@ void SwMMResultPrintDialog::FillInPrinterSettings()
sal_Int32 count = xConfigItem->GetMergedDocumentCount();
m_xToNF->set_value(count);
m_xToNF->set_max(count);
-
- m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter());
}
void SwMMResultEmailDialog::FillInEmailSettings()