drop unwanted scroll corner

Change-Id: I82143de336df91c5ca69693f6255b0d729e8381b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137978
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 0 insertions, 23 deletions

diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index fc9251074e64..790a3f88b22a 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -46,7 +46,6 @@ namespace frm
         ,m_pViewport            ( nullptr                )
         ,m_pHScroll             ( nullptr                )
         ,m_pVScroll             ( nullptr                )
-        ,m_pScrollCorner        ( nullptr                )
         ,m_pEngine              ( _pEngine            )
         ,m_pTextAttrListener    ( _pTextAttrListener  )
         ,m_pSelectionListener   ( _pSelectionListener )
@@ -84,7 +83,6 @@ namespace frm
         m_pAntiImpl->SetBackground( Wallpaper( m_pAntiImpl->GetSettings().GetStyleSettings().GetFieldColor() ) );
     }
 
-
     RichTextControlImpl::~RichTextControlImpl( )
     {
         m_pEngine->RemoveView( m_pView.get() );
@@ -93,10 +91,8 @@ namespace frm
         m_pViewport.disposeAndClear();
         m_pHScroll.disposeAndClear();
         m_pVScroll.disposeAndClear();
-        m_pScrollCorner.disposeAndClear();
     }
 
-
     void RichTextControlImpl::implUpdateAttribute( const AttributeHandlerPool::const_iterator& _pHandler )
     {
         if  (  ( _pHandler->first == sal_uInt16(SID_ATTR_CHAR_WEIGHT) )
@@ -355,21 +351,9 @@ namespace frm
             m_pHScroll->Show();
         }
 
-        if ( m_pHScroll && m_pVScroll )
-        {
-            m_pScrollCorner.disposeAndClear();
-            m_pScrollCorner = VclPtr<ScrollBarBox>::Create( m_pAntiImpl );
-            m_pScrollCorner->Show();
-        }
-        else
-        {
-            m_pScrollCorner.disposeAndClear();
-        }
-
         layoutWindow();
     }
 
-
     void RichTextControlImpl::ensureLineBreakSetting()
     {
         if ( !windowHasAutomaticLineBreak() )
@@ -378,7 +362,6 @@ namespace frm
         layoutWindow();
     }
 
-
     void RichTextControlImpl::layoutWindow()
     {
         if ( !m_bHasEverBeenShown )
@@ -424,8 +407,6 @@ namespace frm
             m_pHScroll->SetThickness(nScrollBarHeight);
             m_pHScroll->SetPosSizePixel( Point( 0, aViewportPlaygroundPixel.Height() ), Size( aViewportPlaygroundPixel.Width(), nScrollBarHeight ) );
         }
-        if ( m_pScrollCorner )
-            m_pScrollCorner->SetPosSizePixel( Point( aViewportPlaygroundPixel.Width(), aViewportPlaygroundPixel.Height() ), Size( nScrollBarWidth, nScrollBarHeight ) );
 
         // paper size
         if ( windowHasAutomaticLineBreak() )
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index f1cbb81ffe22..86b1a1831684 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -22,7 +22,6 @@
 #include "richtextviewport.hxx"
 #include "richtextengine.hxx"
 #include <svtools/scrolladaptor.hxx>
-#include <vcl/scrbar.hxx>
 #include <editeng/editdata.hxx>
 
 #include <map>
@@ -56,7 +55,6 @@ namespace frm
         VclPtr<RichTextViewPort>       m_pViewport;
         VclPtr<ScrollAdaptor>          m_pHScroll;
         VclPtr<ScrollAdaptor>          m_pVScroll;
-        VclPtr<ScrollBarBox>           m_pScrollCorner;
         RichTextEngine*         m_pEngine;
         std::unique_ptr<EditView> m_pView;
         ITextAttributeListener* m_pTextAttrListener;
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index cb4d613e36b2..da547afce6c6 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -43,14 +43,12 @@ namespace frm
         implInit( _pEngine, _pTextAttribListener, _pSelectionListener );
     }
 
-
     void RichTextControl::implInit( RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
     {
         m_pImpl.reset( new RichTextControlImpl( this, _pEngine, _pTextAttribListener, _pSelectionListener ) );
         SetCompoundControl( true );
     }
 
-
     RichTextControl::~RichTextControl( )
     {
         disposeOnce();