From bf8a6cacd06d7c1961b5db8cc79ee4bbdb342e43 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 14 Feb 2018 09:22:30 +0200 Subject: loplugin:changetoolsgen in filter..framework Change-Id: I622da8a0c096c74efd97326451c4576b230f0483 Reviewed-on: https://gerrit.libreoffice.org/49701 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- forms/source/richtext/richtextimplcontrol.cxx | 16 ++++++++-------- forms/source/solar/control/navtoolbar.cxx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'forms/source') diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 663e9a3d7965..003e11b03145 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -409,8 +409,8 @@ namespace frm // the size of the viewport - note that the viewport does *not* occupy all the place // which is left when subtracting the scrollbar width/height Size aViewportPlaygroundPixel( aPlaygroundSizePixel ); - aViewportPlaygroundPixel.Width() = ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Width() - nScrollBarWidth ) ); - aViewportPlaygroundPixel.Height() = ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Height() - nScrollBarHeight ) ); + aViewportPlaygroundPixel.setWidth( ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Width() - nScrollBarWidth ) ) ); + aViewportPlaygroundPixel.setHeight( ::std::max( long( 10 ), long( aViewportPlaygroundPixel.Height() - nScrollBarHeight ) ) ); Size aViewportPlaygroundLogic( m_pViewport->PixelToLogic( aViewportPlaygroundPixel ) ); const long nOffset = 2; @@ -545,10 +545,10 @@ namespace frm { void lcl_inflate( tools::Rectangle& _rRect, long _nInflateX, long _nInflateY ) { - _rRect.Left() -= _nInflateX; - _rRect.Right() += _nInflateX; - _rRect.Top() -= _nInflateY; - _rRect.Bottom() += _nInflateY; + _rRect.SetLeft( _rRect.Left() - _nInflateX ); + _rRect.SetRight( _rRect.Right() + _nInflateX ); + _rRect.SetTop( _rRect.Top() - _nInflateY ); + _rRect.SetBottom( _rRect.Bottom() + _nInflateY ); } } @@ -594,8 +594,8 @@ namespace frm tools::Rectangle aPlayground( aPos, aSize ); Size aOnePixel( _pDev->PixelToLogic( Size( 1, 1 ) ) ); - aPlayground.Right() -= aOnePixel.Width(); - aPlayground.Bottom() -= aOnePixel.Height(); + aPlayground.SetRight( aPlayground.Right() - aOnePixel.Width() ); + aPlayground.SetBottom( aPlayground.Bottom() - aOnePixel.Height() ); // background _pDev->SetLineColor(); diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 1cc3c42f8690..dc8de707c0c4 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -634,7 +634,7 @@ namespace frm } Size aSize( _pItemWindow->GetTextWidth( sItemText ), /* _pItemWindow->GetSizePixel( ).Height() */ _pItemWindow->GetTextHeight() + 4 ); - aSize.Width() += 6; + aSize.setWidth( aSize.Width() + 6 ); _pItemWindow->SetSizePixel( aSize ); m_pToolbar->SetItemWindow( _nItemId, _pItemWindow ); -- cgit