5 files changed, 9 insertions, 20 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 9728e1df71b2..d295cddfb343 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2022-06-27 18:59:37 using:
+ Generated on 2022-08-08 12:07:41 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -54,6 +54,7 @@
 #include <string.h>
 #include <string>
 #include <string_view>
+#include <thread>
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
@@ -70,7 +71,6 @@
 #include <osl/interlck.h>
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
-#include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
 #include <rtl/character.hxx>
@@ -156,7 +156,6 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 70991525331a..3c5cbd0ec6af 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1353,16 +1353,15 @@ void Shell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
     aTabBarSize.setWidth( rSize.Width() );
 
     Size aSz( rSize );
-    Size aScrollBarBoxSz( aScrollBarBox->GetSizePixel() );
-    aSz.AdjustHeight( -(aScrollBarBoxSz.Height()) );
-    aSz.AdjustHeight( -(aTabBarSize.Height()) );
+    auto nScrollBarSz(Application::GetSettings().GetStyleSettings().GetScrollBarSize());
+    aSz.AdjustHeight(-nScrollBarSz);
+    aSz.AdjustHeight(-aTabBarSize.Height());
 
     Size aOutSz( aSz );
-    aSz.AdjustWidth( -(aScrollBarBoxSz.Width()) );
-    aScrollBarBox->SetPosPixel( Point( rSize.Width() - aScrollBarBoxSz.Width(), rSize.Height() - aScrollBarBoxSz.Height() ) );
-    aVScrollBar->SetPosSizePixel( Point( rPos.X()+aSz.Width(), rPos.Y() ), Size( aScrollBarBoxSz.Width(), aSz.Height() ) );
-    aHScrollBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aSz.Height() ), Size( aSz.Width(), aScrollBarBoxSz.Height() ) );
-    pTabBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aScrollBarBoxSz.Height()+aSz.Height()), aTabBarSize );
+    aSz.AdjustWidth(-nScrollBarSz);
+    aVScrollBar->SetPosSizePixel( Point( rPos.X()+aSz.Width(), rPos.Y() ), Size( nScrollBarSz, aSz.Height() ) );
+    aHScrollBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aSz.Height() ), Size( aOutSz.Width(), nScrollBarSz ) );
+    pTabBar->SetPosSizePixel( Point( rPos.X(), rPos.Y() + nScrollBarSz + aSz.Height()), aTabBarSize );
 
     if (pLayout)
         pLayout->SetPosSizePixel(rPos, dynamic_cast<DialogWindow*>(pCurWin.get()) ? aSz : aOutSz);
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index a075b1f8f2db..df083128fe49 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -161,7 +161,6 @@ Shell::Shell( SfxViewFrame* pFrame_, SfxViewShell* /* pOldShell */ ) :
     m_aCurDocument( ScriptDocument::getApplicationScriptDocument() ),
     aHScrollBar( VclPtr<ScrollAdaptor>::Create(&GetViewFrame()->GetWindow(), true) ),
     aVScrollBar( VclPtr<ScrollAdaptor>::Create(&GetViewFrame()->GetWindow(), false) ),
-    aScrollBarBox( VclPtr<ScrollBarBox>::Create(&GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE )) ),
     pLayout(nullptr),
     aObjectCatalog(VclPtr<ObjectCatalog>::Create(&GetViewFrame()->GetWindow())),
     m_bAppBasicModified( false ),
@@ -231,7 +230,6 @@ Shell::~Shell()
     SetCurWindow( nullptr );
 
     aObjectCatalog.disposeAndClear();
-    aScrollBarBox.disposeAndClear();
     aVScrollBar.disposeAndClear();
     aHScrollBar.disposeAndClear();
 
@@ -414,10 +412,8 @@ void Shell::InitScrollBars()
     aVScrollBar->Enable();
     aVScrollBar->Show();
     aHScrollBar->Show();
-    aScrollBarBox->Show();
 }
 
-
 void Shell::InitTabBar()
 {
     pTabBar->Enable();
@@ -425,13 +421,11 @@ void Shell::InitTabBar()
     pTabBar->SetSelectHdl( LINK( this, Shell, TabBarHdl ) );
 }
 
-
 void Shell::OuterResizePixel( const Point &rPos, const Size &rSize )
 {
     AdjustPosSizePixel( rPos, rSize );
 }
 
-
 IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
 {
     sal_uInt16 nCurId = pCurTabBar->GetCurPageId();
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index e61249650c0f..d0ac5611566c 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -43,7 +43,6 @@
 #include <svx/svdpagv.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/print.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <xmlscript/xml_helper.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index cecf060c4074..ef1378580c10 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -27,7 +27,6 @@
 #include <svx/ifaceids.hxx>
 #include <svl/srchitem.hxx>
 #include <svtools/scrolladaptor.hxx>
-#include <vcl/scrbar.hxx>
 #include <map>
 #include <memory>
 #include <string_view>
@@ -71,7 +70,6 @@ private:
 
     VclPtr<ScrollAdaptor> aHScrollBar;
     VclPtr<ScrollAdaptor> aVScrollBar;
-    VclPtr<ScrollBarBox> aScrollBarBox;
     VclPtr<TabBar>       pTabBar;           // basctl::TabBar
     bool                 bCreatingWindow;