[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 6bd9fc46121c3488c836b011f5c37c996c507aac
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 17 14:33:04 2019 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 18 13:14:29 2019 +0200

    scrollbar is outside the widget now, not inside
    
    Change-Id: Ia92658c7a534928209906b8adfb5f9451b513ff0
    Reviewed-on: https://gerrit.libreoffice.org/75798
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index dcc3872ab5cc..560d83a95d06 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -277,8 +277,6 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
 
     // calc description height
     Size aSize = GetOutputSizePixel();
-    if ( m_bHasScrollBar )
-        aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
 
     aSize.AdjustWidth( -(ICON_OFFSET) );
     aSize.setHeight( 10000 );
@@ -307,9 +305,6 @@ tools::Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
 
     Size aSize( GetOutputSizePixel() );
 
-    if ( m_bHasScrollBar )
-        aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
-
     if ( m_vEntries[ nPos ]->m_bActive )
         aSize.setHeight( m_nActiveHeight );
     else
@@ -650,9 +645,6 @@ void ExtensionBox_Impl::Paint(vcl::RenderContext& rRenderContext, const tools::R
     Point aStart( 0, -m_nTopIndex );
     Size aSize(GetOutputSizePixel());
 
-    if ( m_bHasScrollBar )
-        aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
-
     const ::osl::MutexGuard aGuard( m_entriesMutex );
 
     for (auto const& entry : m_vEntries)