summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-13 14:21:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-14 12:50:37 +0100
commitf841dada1a5018897cce29ccf972da33ece4738c (patch)
treeaf861d8c6abf98eed1b20ba7fdab2b3997d6e9be /chart2
parent9763383ebb7e5b10ba9e7557dffa803a8d392c0d (diff)
loplugin:changetoolsgen in canvas..cui
Change-Id: I4e320055a3dbe4159c2aa2714e1ee98182e1e80a Reviewed-on: https://gerrit.libreoffice.org/49642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx20
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx4
4 files changed, 14 insertions, 14 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6a615ad7b409..f58b25264fca 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1006,7 +1006,7 @@ void DataBrowser::PaintCell(
OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const
{
Point aPos( rRect.TopLeft());
- aPos.X() += 1;
+ aPos.setX( aPos.X() + 1 );
OUString aText = GetCellText( m_nSeekRow, nColumnId );
Size TxtSize( GetDataWindow().GetTextWidth( aText ), GetDataWindow().GetTextHeight());
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 8cf6e4252c43..ac7201d5e987 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -73,7 +73,7 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame:
Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapMode(MapUnit::MapAppFont)));
Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapMode(MapUnit::MapAppFont)));
- aSize.Width() += aAdditionalRoadmapSize.Width();
+ aSize.setWidth( aSize.Width() + aAdditionalRoadmapSize.Width() );
SetSizePixel(aSize);
if (!m_pDialogModel->getModel().isDataFromSpreadsheet())
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 8949e8dbc58a..f0f6593d31fd 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -348,15 +348,15 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* pRectangle)
if (!IsMapModeEnabled())
{
- aRectangle.Left() /= fXScale;
- aRectangle.Right() /= fXScale;
- aRectangle.Top() /= fYScale;
- aRectangle.Bottom() /= fYScale;
+ aRectangle.SetLeft( aRectangle.Left() / fXScale );
+ aRectangle.SetRight( aRectangle.Right() / fXScale );
+ aRectangle.SetTop( aRectangle.Top() / fYScale );
+ aRectangle.SetBottom( aRectangle.Bottom() / fYScale );
}
Point aOffset = this->GetOffsetPixelFrom(*pEditWin);
- 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) );
aRectangle = tools::Rectangle(aRectangle.TopLeft() + aOffset, aRectangle.GetSize());
}
@@ -413,11 +413,11 @@ tools::Rectangle ChartWindow::GetBoundingBox()
double fXScale( aCWMapMode.GetScaleX() );
double fYScale( aCWMapMode.GetScaleY() );
Point aOffset = 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 = 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);
}
return aBBox;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index fcbccefcaa97..8c62f46ef7b7 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -432,8 +432,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
Size aObjectSize( 4000, 2500 );
tools::Rectangle aPageRect( tools::Rectangle( Point( 0, 0 ), pPage->GetSize() ) );
Point aObjectPos = aPageRect.Center();
- aObjectPos.X() -= aObjectSize.Width() / 2;
- aObjectPos.Y() -= aObjectSize.Height() / 2;
+ aObjectPos.setX( aObjectPos.X() - aObjectSize.Width() / 2 );
+ aObjectPos.setY( aObjectPos.Y() - aObjectSize.Height() / 2 );
tools::Rectangle aRect( aObjectPos, aObjectSize );
switch ( nID )