dbaccess/source/ui/inc/JoinTableView.hxx | 2 -- dbaccess/source/ui/querydesign/JoinTableView.cxx | 12 +++--------- forms/source/richtext/richtextimplcontrol.cxx | 19 ------------------- forms/source/richtext/richtextimplcontrol.hxx | 2 -- forms/source/richtext/richtextvclcontrol.cxx | 2 -- reportdesign/source/ui/inc/ScrollHelper.hxx | 2 -- reportdesign/source/ui/report/ScrollHelper.cxx | 11 ----------- reportdesign/source/ui/report/dlgedfunc.cxx | 1 - 8 files changed, 3 insertions(+), 48 deletions(-)
New commits: commit 479cf04cee6f360c9bca618369b6b545b94e55ef Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 8 12:34:05 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 8 20:26:28 2022 +0200 drop unwanted scroll corner Change-Id: I82143de336df91c5ca69693f6255b0d729e8381b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137978 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> 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(); commit b8128ae611a23e81544f7e4b96ec196a8594f840 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 8 12:23:41 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 8 20:26:14 2022 +0200 no need for ScrollBarBox if bg is already the desired color Change-Id: I94f83a1c2142b8b8712fc3527a90dad4f0babb9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137977 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 4dedc70e3c6c..1b6c8c79ed16 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -22,7 +22,6 @@ #include <vcl/window.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> -#include <vcl/scrbar.hxx> #include <vcl/vclptr.hxx> #include <vcl/transfer.hxx> @@ -53,7 +52,6 @@ namespace dbaui { VclPtr<ScrollAdaptor> m_aHScrollBar; VclPtr<ScrollAdaptor> m_aVScrollBar; - VclPtr<vcl::Window> m_pCornerWindow; VclPtr<OJoinTableView> m_pTableView; protected: diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 5cd3ec1f41ed..98d08374df91 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -68,11 +68,12 @@ using namespace ::com::sun::star::lang; OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParent) ,m_aHScrollBar( VclPtr<ScrollAdaptor>::Create(this, true) ) ,m_aVScrollBar( VclPtr<ScrollAdaptor>::Create(this, false) ) - ,m_pCornerWindow(VclPtr<ScrollBarBox>::Create(this, WB_3DLOOK)) ,m_pTableView(nullptr) { - // ScrollBars + StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); + SetBackground(aSystemStyle.GetFaceColor()); + // ScrollBars GetHScrollBar().SetRange( Range(0, 1000) ); GetVScrollBar().SetRange( Range(0, 1000) ); @@ -81,7 +82,6 @@ OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParen GetHScrollBar().Show(); GetVScrollBar().Show(); - m_pCornerWindow->Show(); // normally we should be SCROLL_PANE SetAccessibleRole(AccessibleRole::SCROLL_PANE); @@ -96,7 +96,6 @@ void OScrollWindowHelper::dispose() { m_aHScrollBar.disposeAndClear(); m_aVScrollBar.disposeAndClear(); - m_pCornerWindow.disposeAndClear(); m_pTableView.clear(); vcl::Window::dispose(); } @@ -134,11 +133,6 @@ void OScrollWindowHelper::Resize() Size( nVScrollWidth, aTotalOutputSize.Height()-nHScrollHeight ) ); - m_pCornerWindow->SetPosSizePixel( - Point( aTotalOutputSize.Width() - nVScrollWidth, aTotalOutputSize.Height() - nHScrollHeight), - Size( nVScrollWidth, nHScrollHeight ) - ); - GetHScrollBar().SetPageSize( aTotalOutputSize.Width() ); GetHScrollBar().SetVisibleSize( aTotalOutputSize.Width() ); diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 02b34d6e6034..6b73aa756fdc 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -20,7 +20,6 @@ #pragma once #include <svtools/scrolladaptor.hxx> -#include <vcl/scrbar.hxx> #include <com/sun/star/report/XSection.hpp> #include <comphelper/propmultiplex.hxx> #include "ReportDefines.hxx" @@ -47,7 +46,6 @@ namespace rptui private: VclPtr<ScrollAdaptor> m_aHScroll; VclPtr<ScrollAdaptor> m_aVScroll; - VclPtr<ScrollBarBox> m_aCornerWin; // window in the bottom right corner Size m_aTotalPixelSize; VclPtr<ODesignView> m_pParent; VclPtr<OReportWindow> m_aReportWindow; diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index de342a17807c..3445abe96e40 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -47,7 +47,6 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) ,OPropertyChangeListener(m_aMutex) ,m_aHScroll( VclPtr<ScrollAdaptor>::Create(this, true) ) ,m_aVScroll( VclPtr<ScrollAdaptor>::Create(this, false) ) - ,m_aCornerWin( VclPtr<ScrollBarBox>::Create(this) ) ,m_pParent(_pDesignView) ,m_aReportWindow(VclPtr<rptui::OReportWindow>::Create(this,m_pParent)) { @@ -77,7 +76,6 @@ void OScrollWindowHelper::dispose() m_aHScroll.disposeAndClear(); m_aVScroll.disposeAndClear(); - m_aCornerWin.disposeAndClear(); m_aReportWindow.disposeAndClear(); m_pParent.clear(); OScrollWindowHelper_BASE::dispose(); @@ -151,15 +149,6 @@ Size OScrollWindowHelper::ResizeScrollBars() m_aVScroll->Show( bVVisible ); m_aHScroll->Show( bHVisible ); - // disable painting in the corner between the scrollbars - if ( bVVisible && bHVisible ) - { - m_aCornerWin->SetPosSizePixel(Point(aOutPixSz.Width(), aOutPixSz.Height()), Size(nScrSize, nScrSize) ); - m_aCornerWin->Show(); - } - else - m_aCornerWin->Hide(); - const Point aOffset = LogicToPixel(Point(SECTION_OFFSET, SECTION_OFFSET), MapMode(MapUnit::MapAppFont)); // resize scrollbars and set their ranges { diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 6252e298e8bd..5a2e36e567f2 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/scrbar.hxx> #include <vcl/seleng.hxx> #include <vcl/ptrstyle.hxx> #include <com/sun/star/embed/EmbedStates.hpp>
