diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 08:32:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 11:38:45 +0100 |
| commit | 261d422d9e0dc4d36ddfa43180e63286cbb89bf4 (patch) | |
| tree | 98e486dc80bc5c48dd885ddd5e51934a3f8d6ebe /oox | |
| parent | 0e687595295e210e6275eda57a253ca66e8249ce (diff) | |
Revert "loplugin:changetoolsgen in oox,reportdesign" and reapply..
the plugin 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 457220bc2c0142c5b6f4135cb688ccfc99fec792.
Change-Id: I2c6b1092c8bfa4fa14acbc7445f546d43cb2a86e
Reviewed-on: https://gerrit.libreoffice.org/49833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 72f2eac304ba..8f374c0d54d1 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -386,9 +386,9 @@ awt::Size ShapeExport::MapSize( const awt::Size& rSize ) const Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) ); if ( !aRetSize.Width() ) - aRetSize.setWidth( ++aRetSize.Width() ); + aRetSize.AdjustWidth( 1 ); if ( !aRetSize.Height() ) - aRetSize.setHeight( ++aRetSize.Height() ); + aRetSize.AdjustHeight( 1 ); return awt::Size( aRetSize.Width(), aRetSize.Height() ); } |