[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/source vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/inc/strings.hrc                |    1 -
 vcl/source/window/printdlg.cxx     |    1 +
 vcl/unx/generic/print/prtsetup.cxx |   11 -----------
 vcl/unx/generic/print/prtsetup.hxx |    2 --
 4 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit eeae2032476e8c8645ab438fbb379f3151c8e472
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Nov 12 16:05:54 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Nov 13 07:27:42 2019 +0100

    tdf#128717 Sync duplex value from "Properties" dialog
    
    The value for duplex can be set in two places, the main
    print dialog and the "Properties" dialog.
    
    Therefore, update the value for duplex combobox in the main
    print dialog with the value set in the PrinterController,
    to take into account potential changes carried out in the
    "Properties" dialog.
    
    (Other options, like orientation already worked fine before,
    as did synchronisation the other way around.)
    
    Change-Id: Ie68f1cfbba6def82c85745e1c361e28a1513e647
    Reviewed-on: https://gerrit.libreoffice.org/82528
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 079ce29ebb6f..7750baf5039d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1873,6 +1873,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
             }
 
             updateOrientationBox( false );
+            setupPaperSidesBox();
 
             // tdf#63905 don't use cache: page size may change
             preparePreview(false);
commit f166f0cf4f92d1d765d9ae9003d9d725ba120e54
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Nov 12 16:04:09 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Nov 13 07:27:35 2019 +0100

    Related tdf#128717:  Drop "<ignore>" value for duplex and paper tray
    
    Drop the artificial extra value "<ignore>" for the duplex and paper tray
    options in the "Properties..." dialog used in the print dialog on Linux.
    
    Those extra values were introduced in commit
    a9f8d75e6c54b40845fc198019788ff6b568aaf5
    ("Administration utility for Unix PS-Print Environment") in 2001.
    
    The two corresponding comboboxes are greyed out if there are no PPD
    options "Duplex" and/or "InputSlot". And if there are valid values
    for these options, one of those is preselected.
    
    I see no use in allowing to explicitly setting the value to "<ignore>".
    Not passing any value explicitly to CUPS will cause the default option
    to be used anyway.
    
    Having an additional option for Duplex is also inconsistent with the
    (revamped) main print dialog, where that additional value is not
    offered for the duplex option, i.e. the "Properties" dialog offers
    more choices than the main print dialog.
    
    Change-Id: Id9d20a061e51921e601d53d74aa8079fe3c59aca
    Reviewed-on: https://gerrit.libreoffice.org/82527
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index c561de71c369..7e936fc711a2 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -117,7 +117,6 @@
 #define SV_PRINT_TOFILE_TXT                          NC_("SV_PRINT_TOFILE_TXT", "Print to File...")
 #define SV_PRINT_DEFPRT_TXT                          NC_("SV_PRINT_DEFPRT_TXT", "Default printer")
 #define SV_PRINT_QUERYFAXNUMBER_TXT                  NC_("SV_PRINT_QUERYFAXNUMBER_TXT", "Please enter the fax number")
-#define SV_PRINT_INVALID_TXT                         NC_("SV_PRINT_INVALID_TXT", "<ignore>")
 #define SV_PRINT_CUSTOM_TXT                          NC_("SV_PRINT_CUSTOM_TXT", "Custom")
 
 #define SV_EDIT_WARNING_STR                          NC_("SV_EDIT_WARNING_STR", "The inserted text exceeded the maximum length of this text field. The text was truncated.")
diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx
index a484de3da1b5..ad5d0fc53553 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -61,8 +61,6 @@ void RTSDialog::insertAllPPDValues(weld::ComboBox& rBox, const PPDParser* pParse
         if (nPos != -1)
             rBox.set_active(nPos);
     }
-    else
-        rBox.set_active_text(m_aInvalidString);
 }
 
 /*
@@ -72,7 +70,6 @@ void RTSDialog::insertAllPPDValues(weld::ComboBox& rBox, const PPDParser* pParse
 RTSDialog::RTSDialog(const PrinterInfo& rJobData, weld::Window* pParent)
     : GenericDialogController(pParent, "vcl/ui/printerpropertiesdialog.ui", "PrinterPropertiesDialog")
     , m_aJobData(rJobData)
-    , m_aInvalidString(VclResId(SV_PRINT_INVALID_TXT))
     , m_bDataModified(false)
     , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol"))
     , m_xOKButton(m_xBuilder->weld_button("ok"))
@@ -152,14 +149,6 @@ RTSPaperPage::RTSPaperPage(weld::Widget* pPage, RTSDialog* pDialog)
     m_xSlotBox->connect_changed( LINK( this, RTSPaperPage, SelectHdl ) );
     m_xCbFromSetup->connect_toggled( LINK( this, RTSPaperPage, CheckBoxHdl ) );
 
-    // duplex
-    m_xDuplexBox->append_text(m_pParent->m_aInvalidString);
-
-    // paper does not have an invalid entry
-
-    // input slots
-    m_xSlotBox->append_text(m_pParent->m_aInvalidString);
-
     update();
 }
 
diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index a2282e2980b1..d5de649ddd81 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -35,8 +35,6 @@ class RTSDialog : public weld::GenericDialogController
 
     ::psp::PrinterInfo      m_aJobData;
 
-    // some resources
-    OUString const          m_aInvalidString;
     bool m_bDataModified;
 
     // controls