[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/vcl vcl/source

[Samuel Mehrbrodt (via logerrit)]

 include/vcl/tabpage.hxx       |    2 --
 vcl/source/window/tabpage.cxx |    5 -----
 2 files changed, 7 deletions(-)

New commits:
commit bc5b764c7c77e992d4d3df045c008f8cabc6a237
Author:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Nov 24 08:59:11 2020 +0100
Commit:     Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Nov 24 21:17:48 2020 +0100

    Remove unused ScrollBarBox from tabpage
    
    This displays an empty rectangle at the upper left of the tabpage.
    
    Change-Id: I8424a3f8ec4896814b135aa2c86012f0b33ee1be
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106480
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    (cherry picked from commit 6df0e538ff05b98e1123c5ad1d77f554007bff12)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106440
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 1a66bab9eabd..45d1c1220d60 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -25,7 +25,6 @@
 #include <vcl/IContext.hxx>
 
 class ScrollBar;
-class ScrollBarBox;
 
 class VCL_DLLPUBLIC TabPage
     : public vcl::Window
@@ -40,7 +39,6 @@ private:
 
     VclPtr<ScrollBar>    m_pVScroll;
     VclPtr<ScrollBar>    m_pHScroll;
-    VclPtr<ScrollBarBox> m_aScrollBarBox;
     Size                 maScrollArea;
     bool                 mbHasHoriBar;
     bool                 mbHasVertBar;
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 0ee256425709..f3acc5998ec3 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -57,10 +57,6 @@ void TabPage::ImplInit( vcl::Window* pParent, WinBits nStyle 
)
 
     if ( mbHasHoriBar || mbHasVertBar )
     {
-        m_aScrollBarBox.set(
-            VclPtr<ScrollBarBox>::Create(this,
-                                         ((nStyle & (WB_VSCROLL|WB_HSCROLL)) ? 
WB_HIDE : 0)));
-        m_aScrollBarBox->Show();
         SetStyle( GetStyle() | WB_CLIPCHILDREN );
     }
 
@@ -113,7 +109,6 @@ void TabPage::dispose()
 {
     m_pVScroll.disposeAndClear();
     m_pHScroll.disposeAndClear();
-    m_aScrollBarBox.disposeAndClear();
     vcl::Window::dispose();
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits