From b8128ae611a23e81544f7e4b96ec196a8594f840 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 8 Aug 2022 12:23:41 +0100
Subject: no need for ScrollBarBox if bg is already the desired color
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I94f83a1c2142b8b8712fc3527a90dad4f0babb9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 reportdesign/source/ui/inc/ScrollHelper.hxx    |  2 --
 reportdesign/source/ui/report/ScrollHelper.cxx | 11 -----------
 reportdesign/source/ui/report/dlgedfunc.cxx    |  1 -
 3 files changed, 14 deletions(-)

(limited to 'reportdesign')

diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 02b34d6e6034..6b73aa756fdc 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <svtools/scrolladaptor.hxx>
-#include <vcl/scrbar.hxx>
 #include <com/sun/star/report/XSection.hpp>
 #include <comphelper/propmultiplex.hxx>
 #include "ReportDefines.hxx"
@@ -47,7 +46,6 @@ namespace rptui
     private:
         VclPtr<ScrollAdaptor>       m_aHScroll;
         VclPtr<ScrollAdaptor>       m_aVScroll;
-        VclPtr<ScrollBarBox>        m_aCornerWin;       // window in the bottom right corner
         Size                        m_aTotalPixelSize;
         VclPtr<ODesignView>         m_pParent;
         VclPtr<OReportWindow>       m_aReportWindow;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index de342a17807c..3445abe96e40 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -47,7 +47,6 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
     ,OPropertyChangeListener(m_aMutex)
     ,m_aHScroll( VclPtr<ScrollAdaptor>::Create(this, true) )
     ,m_aVScroll( VclPtr<ScrollAdaptor>::Create(this, false) )
-    ,m_aCornerWin( VclPtr<ScrollBarBox>::Create(this) )
     ,m_pParent(_pDesignView)
     ,m_aReportWindow(VclPtr<rptui::OReportWindow>::Create(this,m_pParent))
 {
@@ -77,7 +76,6 @@ void OScrollWindowHelper::dispose()
 
     m_aHScroll.disposeAndClear();
     m_aVScroll.disposeAndClear();
-    m_aCornerWin.disposeAndClear();
     m_aReportWindow.disposeAndClear();
     m_pParent.clear();
     OScrollWindowHelper_BASE::dispose();
@@ -151,15 +149,6 @@ Size OScrollWindowHelper::ResizeScrollBars()
     m_aVScroll->Show( bVVisible );
     m_aHScroll->Show( bHVisible );
 
-    // disable painting in the corner between the scrollbars
-    if ( bVVisible && bHVisible )
-    {
-        m_aCornerWin->SetPosSizePixel(Point(aOutPixSz.Width(), aOutPixSz.Height()), Size(nScrSize, nScrSize) );
-        m_aCornerWin->Show();
-    }
-    else
-        m_aCornerWin->Hide();
-
     const Point aOffset = LogicToPixel(Point(SECTION_OFFSET, SECTION_OFFSET), MapMode(MapUnit::MapAppFont));
     // resize scrollbars and set their ranges
     {
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 6252e298e8bd..5a2e36e567f2 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <vcl/scrbar.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <com/sun/star/embed/EmbedStates.hpp>
-- 
cgit