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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 23 20:11:26 UTC 2020


 vcl/source/window/builder.cxx |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 40673b1710d95c58d2008c083cae542a2c226c40
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 23 14:33:43 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 23 22:10:39 2020 +0200

    GtkSpinButton->NumericField no longer used
    
    Change-Id: I2015f02840e23063fae9295437aa2d5e26fe613b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99319
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1a6546b689a1..bebe56062866 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1877,18 +1877,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
         if (extractHasFrame(rMap))
             nBits |= WB_BORDER;
 
-        if (m_bLegacy)
-        {
-            connectNumericFormatterAdjustment(id, sAdjustment);
-            xWindow = VclPtr<NumericField>::Create(pParent, nBits);
-        }
-        else
-        {
-            connectFormattedFormatterAdjustment(id, sAdjustment);
-            VclPtrInstance<FormattedField> xField(pParent, nBits);
-            xField->GetFormatter().SetMinValue(0);
-            xWindow = xField;
-        }
+        connectFormattedFormatterAdjustment(id, sAdjustment);
+        VclPtrInstance<FormattedField> xField(pParent, nBits);
+        xField->GetFormatter().SetMinValue(0);
+        xWindow = xField;
     }
     else if (name == "GtkLinkButton")
         xWindow = VclPtr<FixedHyperlink>::Create(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL);


More information about the Libreoffice-commits mailing list