diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-11-12 16:04:09 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-11-13 07:27:35 +0100 |
| commit | f166f0cf4f92d1d765d9ae9003d9d725ba120e54 (patch) | |
| tree | 7dd36a8f4996ad1c7ca929c3d7ec0265af987309 /vcl/unx/generic/print | |
| parent | bc3046ee0996f2d25552670825c68ef04bfe303f (diff) | |
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@posteo.de>
Diffstat (limited to 'vcl/unx/generic/print')
| -rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 11 | ||||
| -rw-r--r-- | vcl/unx/generic/print/prtsetup.hxx | 2 |
2 files changed, 0 insertions, 13 deletions
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 |