[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Weghorn (via logerrit)]

 sw/source/ui/dbui/mmresultdialogs.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit f10af6a909bf8e1c2101af4ebc88642c2e219622
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Jul 19 08:27:57 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Jul 22 11:34:12 2019 +0200

    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 at posteo.de>
    (cherry picked from commit 3bc1f99d3a792cdba037bcc757e8611d7e187b73)
    Reviewed-on: https://gerrit.libreoffice.org/75965
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 230d26c98cb7..edecaf648028 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -346,8 +346,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()