diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 11:33:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 19:50:35 +0100 |
| commit | eb5563e7e636a9856d4f1cc23d00a21193b9d0cc (patch) | |
| tree | 23f2d0f58872a42ab4cbc15597211794b193c62b /chart2/source/controller | |
| parent | 11fab5aeaaa72012c63b2c812656a932ef0debf9 (diff) | |
Revert "loplugin:changetoolsgen in canvas..cui" and reapply
because I
(a) forgot to insert parentheses which changes the meaning of some expressions and
(b) I now use the AdjustFoo calls when changing unary operations, which reads much better
This reverts commit f841dada1a5018897cce29ccf972da33ece4738c.
Change-Id: Iff19e1fc99812c086b0a39b71a3f67b98e2f9c8f
Reviewed-on: https://gerrit.libreoffice.org/49841
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller')
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/DrawCommandDispatch.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index f58b25264fca..2a7a41e754cd 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.setX( aPos.X() + 1 ); + aPos.AdjustX(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 ac7201d5e987..9967c6123a76 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.setWidth( aSize.Width() + aAdditionalRoadmapSize.Width() ); + aSize.AdjustWidth(aAdditionalRoadmapSize.Width() ); SetSizePixel(aSize); if (!m_pDialogModel->getModel().isDataFromSpreadsheet()) diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 8c62f46ef7b7..7e318646ebf5 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.setX( aObjectPos.X() - aObjectSize.Width() / 2 ); - aObjectPos.setY( aObjectPos.Y() - aObjectSize.Height() / 2 ); + aObjectPos.AdjustX( -(aObjectSize.Width() / 2) ); + aObjectPos.AdjustY( -(aObjectSize.Height() / 2) ); tools::Rectangle aRect( aObjectPos, aObjectSize ); switch ( nID ) |