diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-23 19:57:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-23 22:43:49 +0200 |
| commit | 3cf6d908c21400e005dcbf03a94282279fe61b9b (patch) | |
| tree | b7cd96e3575cbdd28bc864d877e55bc048c63956 /vcl | |
| parent | 93649784ddbb7d9ca779d14fd60fb97385325d17 (diff) | |
nospin hack no longer in use
Change-Id: Ib855c429ac936f9b7bb219ad4729f99b0625ec37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94734
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 2 | ||||
| -rw-r--r-- | vcl/uiconfig/ui/printdialog.ui | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9fc721ddb010..d0d8bc7d02e6 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2017,9 +2017,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & OUString sPattern = BuilderUtils::extractCustomProperty(rMap); OUString sUnit = extractUnit(sPattern); - WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_BORDER|WB_3DLOOK; - if (!id.endsWith("-nospin")) - nBits |= WB_SPIN | WB_REPEAT; + WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_BORDER|WB_3DLOOK|WB_SPIN|WB_REPEAT; if (sPattern.isEmpty()) { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 2a5d6cde641a..ba86b136b413 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -543,7 +543,7 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC , mxNumPagesText(m_xBuilder->weld_label("totalnumpages")) , mxPreview(new PrintPreviewWindow(this)) , mxPreviewWindow(new weld::CustomWeld(*m_xBuilder, "preview", *mxPreview)) - , mxPageEdit(m_xBuilder->weld_entry("pageedit-nospin")) + , mxPageEdit(m_xBuilder->weld_entry("pageedit")) , mxPagesBtn(m_xBuilder->weld_radio_button("pagespersheetbtn")) , mxBrochureBtn(m_xBuilder->weld_radio_button("brochure")) , mxPagesBoxTitleTxt(m_xBuilder->weld_label("pagespersheettxt")) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 63a55cb64ce6..d10557ac1354 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -237,7 +237,7 @@ </packing> </child> <child> - <object class="GtkEntry" id="pageedit-nospin"> + <object class="GtkEntry" id="pageedit"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">3</property> |