[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 20 15:17:56 UTC 2021


 compilerplugins/clang/unusedmethods.results |    2 --
 include/vcl/weld.hxx                        |    1 -
 vcl/source/app/salvtables.cxx               |    5 -----
 vcl/unx/gtk3/gtk3gtkinst.cxx                |    7 -------
 4 files changed, 15 deletions(-)

New commits:
commit 4c973093249bd6064f6e5675510dd1a2146581a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 20 14:02:06 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 20 17:17:06 2021 +0200

    drop unused get_hscroll_height
    
    Change-Id: Ibf4dffd01c3a6b3f352b2951552e58d476d0d204
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114337
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 86edd49e2943..682f24ce9a56 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -984,8 +984,6 @@ include/vcl/weld.hxx:397
     void weld::ScrolledWindow::hadjustment_set_step_increment(int)
 include/vcl/weld.hxx:399
     enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const
-include/vcl/weld.hxx:404
-    int weld::ScrolledWindow::get_hscroll_height() const
 include/vcl/weld.hxx:531
     struct SystemEnvData weld::Window::get_system_data() const
 include/vcl/weld.hxx:615
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index ee26ea3423a7..31b90880c8d1 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -401,7 +401,6 @@ public:
     {
         m_aHChangeHdl = rLink;
     }
-    virtual int get_hscroll_height() const = 0;
 
     virtual void vadjustment_configure(int value, int lower, int upper, int step_increment,
                                        int page_increment, int page_size)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f1d1a1a88292..d99ac4548817 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2154,11 +2154,6 @@ public:
         return VclPolicyType::NEVER;
     }
 
-    virtual int get_hscroll_height() const override
-    {
-        return m_xScrolledWindow->getHorzScrollBar().get_preferred_size().Height();
-    }
-
     virtual void vadjustment_configure(int value, int lower, int upper, int step_increment,
                                        int page_increment, int page_size) override
     {
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7e84a16e3bc1..f97ba43c1579 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5991,13 +5991,6 @@ public:
         return GtkToVcl(eGtkHPolicy);
     }
 
-    virtual int get_hscroll_height() const override
-    {
-        if (gtk_scrolled_window_get_overlay_scrolling(m_pScrolledWindow))
-            return 0;
-        return gtk_widget_get_allocated_height(gtk_scrolled_window_get_hscrollbar(m_pScrolledWindow));
-    }
-
     virtual void vadjustment_configure(int value, int lower, int upper,
                                        int step_increment, int page_increment,
                                        int page_size) override


More information about the Libreoffice-commits mailing list