diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-14 15:20:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-15 07:27:43 +0100 |
commit | c82802a9ee3514d0b98fbb3783abbc17ec02c3b6 (patch) | |
tree | 0f942fe36637686fcfe61d8c1ded77b2aeadbc37 /sfx2/source/view | |
parent | 45a4e70484e7d90dab07a677914ada2d948b415c (diff) |
loplugin:changetoolsgen in sfx2
Change-Id: I34a007711e2ffc70bdee6823ea9b85f60f819e6e
Reviewed-on: https://gerrit.libreoffice.org/49727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/view')
-rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/lokcharthelper.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 16 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 9e726230326b..f584f366c9b2 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -258,7 +258,7 @@ ClassificationControl::ClassificationControl(vcl::Window* pParent) Size aTextSize(m_pLabel->GetTextWidth(aText), m_pLabel->GetTextHeight()); // Padding. - aTextSize.Width() += 12; + aTextSize.setWidth( aTextSize.Width() + 12 ); m_pLabel->SetText(aText); m_pLabel->SetSizePixel(aTextSize); m_pLabel->Show(); @@ -306,10 +306,10 @@ void ClassificationControl::SetOptimalSize() Point aPosition = m_pCategory->GetPosPixel(); - aSize.Height() = std::max(aSize.Height(), m_pLabel->get_preferred_size().Height()); - aSize.Height() = std::max(aSize.Height(), m_pCategory->get_preferred_size().Height()); + aSize.setHeight( std::max(aSize.Height(), m_pLabel->get_preferred_size().Height()) ); + aSize.setHeight( std::max(aSize.Height(), m_pCategory->get_preferred_size().Height()) ); - aSize.Width() = aPosition.X() + aSize.Width(); + aSize.setWidth( aPosition.X() + aSize.Width() ); SetSizePixel(aSize); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index af0e596a2440..1b7bc574641b 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -582,15 +582,15 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder ) Size aSize( GetWindow().GetOutputSizePixel() ); long nDeltaX = rBorder.Left() + rBorder.Right(); if ( aSize.Width() > nDeltaX ) - aSize.Width() -= nDeltaX; + aSize.setWidth( aSize.Width() - nDeltaX ); else - aSize.Width() = 0; + aSize.setWidth( 0 ); long nDeltaY = rBorder.Top() + rBorder.Bottom(); if ( aSize.Height() > nDeltaY ) - aSize.Height() -= nDeltaY; + aSize.setHeight( aSize.Height() - nDeltaY ); else - aSize.Height() = 0; + aSize.setHeight( 0 ); pF->GetWindow().SetPosSizePixel( aPos, aSize ); } diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx index dc82d2ffe4db..b3a326bfbc0b 100644 --- a/sfx2/source/view/lokcharthelper.cxx +++ b/sfx2/source/view/lokcharthelper.cxx @@ -140,11 +140,11 @@ tools::Rectangle LokChartHelper::GetChartBoundingBox() double fXScale( aCWMapMode.GetScaleX() ); double fYScale( aCWMapMode.GetScaleY() ); Point aOffset = pWindow->GetOffsetPixelFrom(*pRootWin); - aOffset.X() *= (TWIPS_PER_PIXEL / fXScale); - aOffset.Y() *= (TWIPS_PER_PIXEL / fYScale); + aOffset.setX( aOffset.X() * (TWIPS_PER_PIXEL / fXScale) ); + aOffset.setY( aOffset.Y() * (TWIPS_PER_PIXEL / fYScale) ); Size aSize = pWindow->GetSizePixel(); - aSize.Width() *= (TWIPS_PER_PIXEL / fXScale); - aSize.Height() *= (TWIPS_PER_PIXEL / fYScale); + aSize.setWidth( aSize.Width() * (TWIPS_PER_PIXEL / fXScale) ); + aSize.setHeight( aSize.Height() * (TWIPS_PER_PIXEL / fYScale) ); aBBox = tools::Rectangle(aOffset, aSize); } } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9016fb4a5bb8..d24bb5b7b623 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1160,8 +1160,8 @@ void SfxViewFrame::SetBorderPixelImpl Size aSize = pVSh->GetWindow()->GetOutputSizePixel(); if ( aSize.Width() && aSize.Height() ) { - aSize.Width() += rBorder.Left() + rBorder.Right(); - aSize.Height() += rBorder.Top() + rBorder.Bottom(); + aSize.setWidth( aSize.Width() + rBorder.Left() + rBorder.Right() ); + aSize.setHeight( aSize.Height() + rBorder.Top() + rBorder.Bottom() ); Size aOldSize = GetWindow().GetOutputSizePixel(); GetWindow().SetOutputSizePixel( aSize ); @@ -1169,8 +1169,8 @@ void SfxViewFrame::SetBorderPixelImpl while ( pParent->GetParent() ) pParent = pParent->GetParent(); Size aOuterSize = pParent->GetOutputSizePixel(); - aOuterSize.Width() += ( aSize.Width() - aOldSize.Width() ); - aOuterSize.Height() += ( aSize.Height() - aOldSize.Height() ); + aOuterSize.setWidth( aOuterSize.Width() + ( aSize.Width() - aOldSize.Width() ) ); + aOuterSize.setHeight( aOuterSize.Height() + ( aSize.Height() - aOldSize.Height() ) ); pParent->SetOutputSizePixel( aOuterSize ); } } @@ -1178,10 +1178,10 @@ void SfxViewFrame::SetBorderPixelImpl { Point aPoint; tools::Rectangle aEditArea( aPoint, GetWindow().GetOutputSizePixel() ); - aEditArea.Left() += rBorder.Left(); - aEditArea.Right() -= rBorder.Right(); - aEditArea.Top() += rBorder.Top(); - aEditArea.Bottom() -= rBorder.Bottom(); + aEditArea.SetLeft( aEditArea.Left() + rBorder.Left() ); + aEditArea.SetRight( aEditArea.Right() - rBorder.Right() ); + aEditArea.SetTop( aEditArea.Top() + rBorder.Top() ); + aEditArea.SetBottom( aEditArea.Bottom() - rBorder.Bottom() ); pVSh->GetWindow()->SetPosSizePixel( aEditArea.TopLeft(), aEditArea.GetSize() ); } } |