diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-02 18:59:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-03 17:11:14 +0100 |
commit | ab285c743afa1c8769581871d7b56374fd8c49f1 (patch) | |
tree | d5628df49fb4db29d474e5e7b7cef4072c33153a /svx/source/stbctrls | |
parent | f4544f3903fed3a656e3cd57e1bd83582e024b96 (diff) |
loplugin:stringadd
tweak the plugin to be more permissive, then validate by hand
afterwards
Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654
Reviewed-on: https://gerrit.libreoffice.org/81942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/stbctrls')
-rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 1e0c63c06a24..c79a778459a2 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -407,8 +407,8 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) pDev->DrawImage( aPnt, pImpl->aPosImage ); aPnt.AdjustX(pImpl->aPosImage.GetSizePixel().Width() ); aPnt.AdjustX(PAINT_OFFSET ); - OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / "; - aStr += GetMetricStr_Impl( pImpl->aPos.Y()); + OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / " + + GetMetricStr_Impl( pImpl->aPos.Y()); tools::Rectangle aRect(aPnt, Point(nSizePosX, rRect.Bottom())); pDev->DrawRect(aRect); vcl::Region aOrigRegion(pDev->GetClipRegion()); @@ -425,8 +425,8 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) aPnt.AdjustX(pImpl->aSizeImage.GetSizePixel().Width() ); Point aDrwPnt = aPnt; aPnt.AdjustX(PAINT_OFFSET ); - aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x "; - aStr += GetMetricStr_Impl( pImpl->aSize.Height() ); + aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " + + GetMetricStr_Impl( pImpl->aSize.Height() ); aRect = tools::Rectangle(aDrwPnt, rRect.BottomRight()); pDev->DrawRect(aRect); aOrigRegion = pDev->GetClipRegion(); @@ -463,14 +463,14 @@ void SvxPosSizeStatusBarControl::ImplUpdateItemText() int nCharsWidth = -1; if ( pImpl->bPos || pImpl->bSize ) { - aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / "; - aText += GetMetricStr_Impl( pImpl->aPos.Y()); + aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / " + + GetMetricStr_Impl( pImpl->aPos.Y()); // widest X/Y string looks like "-999,99" nCharsWidth = 1 + 6 + 3 + 6; // icon + x + slash + y if ( pImpl->bSize ) { - aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x "; - aText += GetMetricStr_Impl( pImpl->aSize.Height() ); + aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " + + GetMetricStr_Impl( pImpl->aSize.Height() ); nCharsWidth += 1 + 1 + 4 + 3 + 4; // icon + space + w + x + h } } |