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>

11 files changed, 16 insertions, 18 deletions

diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index bba4f3c45f03..15a4b5a91d05 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -70,7 +70,7 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
     , m_xNewButton(m_xBuilder->weld_button("new"))
     , m_xDelButton(m_xBuilder->weld_button("delete"))
     , m_xCheckBox(m_xBuilder->weld_check_button("active"))
-    , m_xNumericField(m_xBuilder->weld_spin_button("pass-nospin"))
+    , m_xNumericField(m_xBuilder->weld_spin_button("pass"))
 {
     m_xComboBox->set_size_request(m_xComboBox->get_approximate_digit_width() * 20, -1);
     m_xComboBox->set_height_request_by_rows(12);
diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
index 6041267dd235..56227ae982bf 100644
--- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui
+++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
@@ -220,7 +220,7 @@
                         <property name="can_focus">False</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkSpinButton" id="pass-nospin">
+                          <object class="GtkSpinButton" id="pass">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="activates_default">True</property>
@@ -236,7 +236,7 @@
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes" context="managebreakpoints|label2">Pass count:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">pass-nospin</property>
+                            <property name="mnemonic_widget">pass</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 7e94b17c4875..96c2144c5bdd 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -222,7 +222,7 @@ SaneDlg::SaneDlg(weld::Window* pParent, Sane& rSane, bool bScanEnabled)
     , mxDeviceBox(m_xBuilder->weld_combo_box("deviceCombobox"))
     , mxReslBox(m_xBuilder->weld_combo_box("reslCombobox"))
     , mxAdvancedBox(m_xBuilder->weld_check_button("advancedCheckbutton"))
-    , mxVectorBox(m_xBuilder->weld_spin_button("vectorSpinbutton-nospin"))
+    , mxVectorBox(m_xBuilder->weld_spin_button("vectorSpinbutton"))
     , mxQuantumRangeBox(m_xBuilder->weld_combo_box("quantumRangeCombobox"))
     , mxStringRangeBox(m_xBuilder->weld_combo_box("stringRangeCombobox"))
     , mxBoolCheckBox(m_xBuilder->weld_check_button("boolCheckbutton"))
diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui b/extensions/uiconfig/scanner/ui/sanedialog.ui
index b2a902c1b810..4353b9ea7953 100644
--- a/extensions/uiconfig/scanner/ui/sanedialog.ui
+++ b/extensions/uiconfig/scanner/ui/sanedialog.ui
@@ -612,7 +612,7 @@
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes" context="sanedialog|vectorLabel">Vector element</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">vectorSpinbutton-nospin</property>
+                                <property name="mnemonic_widget">vectorSpinbutton</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
@@ -621,7 +621,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="vectorSpinbutton-nospin">
+                              <object class="GtkSpinButton" id="vectorSpinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="activates_default">True</property>
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index 004fce187e42..cac93d642a2a 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -28,8 +28,8 @@ sw/uiconfig/swriter/ui/columnpage.ui://GtkSpinButton[@id='width2mf'] labelled-by
 sw/uiconfig/swriter/ui/columnpage.ui://GtkSpinButton[@id='width1mf'] labelled-by-and-mnemonic
 sw/uiconfig/swriter/ui/conditionpage.ui://GtkComboBoxText[@id='filter'] no-labelled-by
 sw/uiconfig/swriter/ui/converttexttable.ui://GtkLabel[@id='label4'] orphan-label
-sw/uiconfig/swriter/ui/createaddresslist.ui://GtkEntry[@id='SETNO-nospin'] no-labelled-by
-sw/uiconfig/swriter/ui/createaddresslist.ui://GtkSpinButton[@id='SETNO'] no-labelled-by
+sw/uiconfig/swriter/ui/createaddresslist.ui://GtkEntry[@id='SETNOED'] no-labelled-by
+sw/uiconfig/swriter/ui/createaddresslist.ui://GtkSpinButton[@id='SETNOSB'] no-labelled-by
 sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui://GtkButton[@id='down'] button-no-label
 sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui://GtkButton[@id='up'] button-no-label
 sw/uiconfig/swriter/ui/editbox.ui://GtkEntry[@id='entry'] no-labelled-by
diff --git a/solenv/sanitizers/ui/vcl.suppr b/solenv/sanitizers/ui/vcl.suppr
index 96a13e0cac4f..a174e138243c 100644
--- a/solenv/sanitizers/ui/vcl.suppr
+++ b/solenv/sanitizers/ui/vcl.suppr
@@ -7,7 +7,7 @@ vcl/uiconfig/ui/combobox.ui://GtkEntry[@id='entry'] no-labelled-by
 vcl/uiconfig/ui/combobox.ui://GtkToggleButton[@id='button'] button-no-label
 vcl/uiconfig/ui/combobox.ui://GtkMenuButton[@id='overlaybutton'] button-no-label
 vcl/uiconfig/ui/cupspassworddialog.ui://GtkLabel[@id='text'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkEntry[@id='pageedit-nospin'] no-labelled-by
+vcl/uiconfig/ui/printdialog.ui://GtkEntry[@id='pageedit'] no-labelled-by
 vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='totalnumpages'] orphan-label
 vcl/uiconfig/ui/printdialog.ui://GtkImage[@id='collateimage'] no-labelled-by
 vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='pagemargintxt2'] orphan-label
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 08a9faff23df..b6cc629cfad8 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -216,8 +216,8 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
     , m_xCustomizePB(m_xBuilder->weld_button("CUSTOMIZE"))
     , m_xStartPB(m_xBuilder->weld_button("START"))
     , m_xPrevPB(m_xBuilder->weld_button("PREV"))
-    , m_xSetNoED(m_xBuilder->weld_entry("SETNO-nospin"))
-    , m_xSetNoNF(m_xBuilder->weld_spin_button("SETNO"))
+    , m_xSetNoED(m_xBuilder->weld_entry("SETNOED"))
+    , m_xSetNoNF(m_xBuilder->weld_spin_button("SETNONF"))
     , m_xNextPB(m_xBuilder->weld_button("NEXT"))
     , m_xEndPB(m_xBuilder->weld_button("END"))
     , m_xOK(m_xBuilder->weld_button("ok"))
diff --git a/sw/uiconfig/swriter/ui/createaddresslist.ui b/sw/uiconfig/swriter/ui/createaddresslist.ui
index 4b7000644ab0..50597fb0bb54 100644
--- a/sw/uiconfig/swriter/ui/createaddresslist.ui
+++ b/sw/uiconfig/swriter/ui/createaddresslist.ui
@@ -249,7 +249,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkSpinButton" id="SETNO">
+                              <object class="GtkSpinButton" id="SETNOSB">
                                 <property name="can_focus">True</property>
                                 <property name="no_show_all">True</property>
                                 <property name="activates_default">True</property>
@@ -262,7 +262,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="SETNO-nospin">
+                              <object class="GtkEntry" id="SETNOED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="activates_default">True</property>
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>