sc/source/ui/inc/prevwsh.hxx | 1 -
sc/source/ui/inc/tabview.hxx | 2 --
sc/source/ui/miscdlgs/datatableview.cxx | 1 -
sc/source/ui/view/prevwsh.cxx | 6 ------
sc/source/ui/view/tabview.cxx | 9 ---------
sc/source/ui/view/tabview5.cxx | 3 +--
6 files changed, 1 insertion(+), 21 deletions(-)
New commits:
commit e50f6c023926269f76cd73e085b7a246cd0f88fa
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 8 10:39:28 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 8 14:56:56 2022 +0200
no need for ScrollBarBox when bg is already the desired color
Change-Id: I5e50d67687355b38190a991ea539b2d40ef74659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137948
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 94af0b9a518c..c1260a7dbb0d 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -45,7 +45,6 @@ class SC_DLLPUBLIC ScPreviewShell final : public SfxViewShell
VclPtr<ScPreview> pPreview; // Output window
VclPtr<ScrollAdaptor> pHorScroll;
VclPtr<ScrollAdaptor> pVerScroll;
- VclPtr<vcl::Window> pCorner;
TriState nSourceDesignMode; // form design mode from TabView
SvxZoomType eZoom;
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 97c6e9681423..ebb7337d78b7 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -23,7 +23,6 @@
#include <array>
#include <memory>
#include <svtools/scrolladaptor.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/help.hxx>
#include "hiranges.hxx"
@@ -154,7 +153,6 @@ private:
VclPtr<ScrollAdaptor> aHScrollRight;
VclPtr<ScCornerButton> aCornerButton;
VclPtr<ScCornerButton> aTopButton;
- VclPtr<ScrollBarBox> aScrollBarBox;
std::shared_ptr<sc::SpellCheckContext> mpSpellCheckCxt;
diff --git a/sc/source/ui/miscdlgs/datatableview.cxx
b/sc/source/ui/miscdlgs/datatableview.cxx
index 41db482eaf05..649f85bfc1a2 100644
--- a/sc/source/ui/miscdlgs/datatableview.cxx
+++ b/sc/source/ui/miscdlgs/datatableview.cxx
@@ -27,7 +27,6 @@
#include <table.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/seleng.hxx>
#include <sal/log.hxx>
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index da04cffd61e0..5ae90d6be22a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -119,8 +119,6 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
eZoom = SvxZoomType::WHOLEPAGE;
- pCorner = VclPtr<ScrollBarBox>::Create( pParent, WB_SIZEABLE );
-
pHorScroll = VclPtr<ScrollAdaptor>::Create(pParent, true);
pVerScroll = VclPtr<ScrollAdaptor>::Create(pParent, false);
@@ -142,7 +140,6 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
pHorScroll->Show( false );
pVerScroll->Show( false );
- pCorner->Show();
SetName("Preview");
}
@@ -199,7 +196,6 @@ ScPreviewShell::~ScPreviewShell()
pPreview.disposeAndClear();
pHorScroll.disposeAndClear();
pVerScroll.disposeAndClear();
- pCorner.disposeAndClear();
// normal mode of operation is switching back to default view in the same
frame,
// so there's no need to activate any other window here anymore
@@ -317,8 +313,6 @@ void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom
)
Size( aWindowPixelSize.Width(), nBarH ) );
pVerScroll->SetPosSizePixel( Point( aPos.X() + aWindowPixelSize.Width(),
aPos.Y() ),
Size( nBarW, aWindowPixelSize.Height() ) );
- pCorner->SetPosSizePixel( Point( aPos.X() + aWindowPixelSize.Width(),
aPos.Y() + aWindowPixelSize.Height() ),
- Size( nBarW, nBarH ) );
UpdateScrollBars();
}
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 45764e6cdd6d..d3fd355ab092 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -182,7 +182,6 @@ ScTabView::ScTabView( vcl::Window* pParent, ScDocShell&
rDocSh, ScTabViewShell*
aHScrollRight( VclPtr<ScrollAdaptor>::Create( pFrameWin, true ) ),
aCornerButton( VclPtr<ScCornerButton>::Create( pFrameWin, &aViewData ) ),
aTopButton( VclPtr<ScCornerButton>::Create( pFrameWin, &aViewData ) ),
- aScrollBarBox( VclPtr<ScrollBarBox>::Create( pFrameWin, WB_SIZEABLE ) ),
aScrollTimer("ScTabView aScrollTimer"),
pTimerWindow( nullptr ),
aExtraEditViewManager( pViewShell, pGridWin ),
@@ -373,10 +372,6 @@ void ScTabView::DoResize( const Point& rOffset, const
Size& rSize, bool bInner )
nSizeY -= nBarY;
}
- // window at the bottom right
- lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ),
Size( nBarX, nBarY ),
- nTotalWidth, bLayoutRTL );
-
if (bHScroll) // Scrollbars horizontal
{
tools::Long nSizeLt = 0; // left scroll bar
@@ -531,8 +526,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size&
rSize, bool bInner )
lcl_SetPosSize( *pTabControl, Point(nPosX, nPosY+nSizeY-nBarY),
Size(nTabSize, nBarY), nTotalWidth,
bLayoutRTL );
nSizeY -= nBarY;
- lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ),
Size( nBarX, nBarY ),
- nTotalWidth, bLayoutRTL );
if( bVScroll )
{
@@ -1478,7 +1471,6 @@ void ScTabView::UpdateShow()
ShowHide( aHScrollRight.get(), bShowH && bHScrollMode );
ShowHide( aVScrollBottom.get(), bVScrollMode );
ShowHide( aVScrollTop.get(), bShowV && bVScrollMode );
- ShowHide( aScrollBarBox.get(), bVScrollMode || bHScrollMode );
ShowHide( pHSplitter, bHScrollMode || bShowH ); // always generated
ShowHide( pVSplitter, bVScrollMode || bShowV );
@@ -2239,7 +2231,6 @@ void ScTabView::EnableRefInput(bool bFlag)
aHScrollRight->EnableInput(bFlag);
aVScrollBottom->EnableInput(bFlag);
aVScrollTop->EnableInput(bFlag);
- aScrollBarBox->EnableInput(bFlag);
// from here on dynamically created ones
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 20c52ea03bf4..245feb8f71f8 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -117,7 +117,7 @@ void ScTabView::Init()
// Don't show anything here, because still in wrong order
// Show is received from UpdateShow during first resize
// pTabControl, pGridWin, aHScrollLeft, aVScrollBottom,
- // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter
+ // aCornerButton, pHSplitter, pVSplitter
// fragment
@@ -212,7 +212,6 @@ ScTabView::~ScTabView()
pRowOutline[i].disposeAndClear();
}
- aScrollBarBox.disposeAndClear();
aCornerButton.disposeAndClear();
aTopButton.disposeAndClear();
aHScrollLeft.disposeAndClear();
