[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/source

[Thorsten Behrens (via logerrit)]

 vcl/source/window/tabpage.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3626a0f6d41c144b7d4d1b1726895344a8388445
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Fri Nov 20 14:38:08 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Nov 20 18:10:30 2020 +0100

    Fix tdf#138373 scrollbars can now actually be nullptr
    
    Change-Id: I224969de51a1d7e0176facb503a5b27cd8da530c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106263
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index ce98bee73e64..2f475bf700bd 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -275,7 +275,8 @@ void TabPage::SetScrollTop( long nTop )
 {
     Point aOld = mnScrollPos;
     lcl_Scroll( mnScrollPos.X() , mnScrollPos.Y() - nTop );
-    m_pHScroll->SetThumbPos( 0 );
+    if( m_pHScroll )
+        m_pHScroll->SetThumbPos( 0 );
     // new pos is 0,0
     mnScrollPos = aOld;
 }
@@ -283,7 +284,8 @@ void TabPage::SetScrollLeft( long nLeft )
 {
     Point aOld = mnScrollPos;
     lcl_Scroll( mnScrollPos.X() - nLeft , mnScrollPos.Y() );
-    m_pVScroll->SetThumbPos( 0 );
+    if( m_pVScroll )
+        m_pVScroll->SetThumbPos( 0 );
     // new pos is 0,0
     mnScrollPos = aOld;
 }