diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 11:03:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-21 06:04:19 +0100 |
commit | 924c0e34fdc36cd44100dafc2c68656ce32374e6 (patch) | |
tree | 05548e06d476b1244abb3ef83013514c7f991b3e /svx/source/fmcomp | |
parent | fd20935bb819cb24e71f4f91b97149c35bc5987d (diff) |
loplugin:changetoolsgen in svx
and fix the regex in the plugin for matching += operator
Change-Id: I26b3e3fac1d4ef3e756cc9431b983b5f27ee76d6
Reviewed-on: https://gerrit.libreoffice.org/50037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/fmcomp')
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 8 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 26 |
3 files changed, 19 insertions, 19 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 3ee95dad4b0d..ce70ebeefedc 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -162,11 +162,11 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) { tools::Rectangle aItemRect = GetItemRect( nItemId ); Point aPt = OutputToScreenPixel( aItemRect.TopLeft() ); - aItemRect.Left() = aPt.X(); - aItemRect.Top() = aPt.Y(); + aItemRect.SetLeft( aPt.X() ); + aItemRect.SetTop( aPt.Y() ); aPt = OutputToScreenPixel( aItemRect.BottomRight() ); - aItemRect.Right() = aPt.X(); - aItemRect.Bottom() = aPt.Y(); + aItemRect.SetRight( aPt.X() ); + aItemRect.SetBottom( aPt.Y() ); sal_uInt16 nPos = GetModelColumnPos(nItemId); Reference< css::container::XIndexContainer > xColumns(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns()); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 262d4d47f5bc..96200e7776cd 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1457,8 +1457,8 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) pGrid->DeactivateCell(); ::tools::Rectangle aColRect = pGrid->GetFieldRect(nId); - aColRect.Top() = 0; - aColRect.Bottom() = pGrid->GetSizePixel().Height(); + aColRect.SetTop( 0 ); + aColRect.SetBottom( pGrid->GetSizePixel().Height() ); pGrid->Invalidate(aColRect); if (bWasEditing) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 07d08e0249a2..307a88344f38 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -416,7 +416,7 @@ namespace { _rButton.SetPosPixel( _rPos ); _rButton.SetSizePixel( _rSize ); - _rPos.X() += static_cast<sal_uInt16>(_rSize.Width()); + _rPos.AdjustX(static_cast<sal_uInt16>(_rSize.Width()) ); } } @@ -490,33 +490,33 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() if (nX > nW) { - aButtonPos.X() = nW-nH; + aButtonPos.setX( nW-nH ); m_aNewBtn->SetPosPixel(aButtonPos); - aButtonPos.X() -= nH; + aButtonPos.AdjustX( -nH ); m_aLastBtn->SetPosPixel(aButtonPos); - aButtonPos.X() -= nH; + aButtonPos.AdjustX( -nH ); m_aNextBtn->SetPosPixel(aButtonPos); - aButtonPos.X() -= nH; + aButtonPos.AdjustX( -nH ); m_aPrevBtn->SetPosPixel(aButtonPos); - aButtonPos.X() -= nH; + aButtonPos.AdjustX( -nH ); m_aFirstBtn->SetPosPixel(aButtonPos); auto nDiff = nX - nW; Size aSize = m_aAbsolute->GetSizePixel(); - aSize.Width() -= nDiff/3.0; + aSize.AdjustWidth( -(nDiff/3.0) ); m_aAbsolute->SetSizePixel(aSize); aSize = m_aRecordCount->GetSizePixel(); - aSize.Width() -= nDiff/3.0*2; + aSize.AdjustWidth( -(nDiff/3.0*2) ); m_aRecordCount->SetSizePixel(aSize); Point aPos = m_aRecordOf->GetPosPixel(); - aPos.X() -= nDiff/3.0; + aPos.AdjustX( -(nDiff/3.0) ); m_aRecordOf->SetPosPixel(aPos); aPos = m_aRecordCount->GetPosPixel(); - aPos.X() -= nDiff/3.0; + aPos.AdjustX( -(nDiff/3.0) ); m_aRecordCount->SetPosPixel(aPos); vcl::Window* pWindows[] = @@ -540,7 +540,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() auto nExcess = (pWindow->GetPosPixel().X() + aSize.Width()) - nW; if (nExcess > 0) { - aSize.Width() -= nExcess; + aSize.AdjustWidth( -nExcess ); pWindow->SetSizePixel(aSize); } } @@ -2044,8 +2044,8 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, tools::Rectangle aArea(rRect); if ((GetMode() & BrowserMode::CURSOR_WO_FOCUS) == BrowserMode::CURSOR_WO_FOCUS) { - aArea.Top() += 1; - aArea.Bottom() -= 1; + aArea.AdjustTop(1 ); + aArea.AdjustBottom( -1 ); } pColumn->Paint(rDev, aArea, m_xPaintRow.get(), getNumberFormatter()); } |