From 53ad646f54f8aa33b86c696c04500fd08ea6f3b6 Mon Sep 17 00:00:00 2001 From: Matteo Casalin Date: Sun, 28 Oct 2012 23:23:53 +0100 Subject: Enforce use of accessors on gen.hxx structures Change-Id: Icd1b2937fdeaba6de1877258731f53ddf996002e Reviewed-on: https://gerrit.libreoffice.org/936 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- vcl/source/control/button.cxx | 2 +- vcl/source/control/imgctrl.cxx | 8 ++++---- vcl/source/control/tabctrl.cxx | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'vcl/source/control') diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index f27de4e0c690..b71ca99ebcb1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -829,7 +829,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF sal_uInt16 nTextStyle = ImplGetTextStyle( nDrawFlags ); sal_uInt16 nStyle; - if( aInRect.nRight < aInRect.nLeft || aInRect.nBottom < aInRect.nTop ) + if( aInRect.Right() < aInRect.Left() || aInRect.Bottom() < aInRect.Top() ) aInRect.SetEmpty(); pDev->Push( PUSH_CLIPREGION ); diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 3c28bb8fe3d1..0f0369c26182 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -166,10 +166,10 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) pWin->SetFillColor(); pWin->SetLineColor( bFlat ? COL_WHITE : COL_BLACK ); pWin->DrawRect( aRect ); - aRect.nLeft++; - aRect.nRight--; - aRect.nTop++; - aRect.nBottom--; + ++aRect.Left(); + --aRect.Right(); + ++aRect.Top(); + --aRect.Bottom(); pWin->SetLineColor( bFlat ? COL_BLACK : COL_WHITE ); pWin->DrawRect( aRect ); pWin->SetLineColor( oldLineCol ); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index dd048737f765..4e1afc25e29c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1553,9 +1553,9 @@ long TabControl::PreNotify( NotifyEvent& rNEvt ) // as used by gtk // TODO: query for the correct sizes Rectangle aRect(*pLastRect); - aRect.nLeft-=2; - aRect.nRight+=2; - aRect.nTop-=3; + aRect.Left()-=2; + aRect.Right()+=2; + aRect.Top()-=3; aClipRgn.Union( aRect ); } if( pRect ) @@ -1564,9 +1564,9 @@ long TabControl::PreNotify( NotifyEvent& rNEvt ) // as used by gtk // TODO: query for the correct sizes Rectangle aRect(*pRect); - aRect.nLeft-=2; - aRect.nRight+=2; - aRect.nTop-=3; + aRect.Left()-=2; + aRect.Right()+=2; + aRect.Top()-=3; aClipRgn.Union( aRect ); } if( !aClipRgn.IsEmpty() ) -- cgit