diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-19 16:21:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 12:54:55 +0100 |
| commit | 7b8a0b7c0dcf8380a6bd2d458d0e20ffc6a5d355 (patch) | |
| tree | 388b2fba4742064ed47c51f0a2688cb53de405ce /svtools/source/control/scriptedtext.cxx | |
| parent | b7da3f2d2518a8b92b0242e311bb31267acd1cd0 (diff) | |
loplugin:changetoolsgen in svtools
Change-Id: I63271ee3126368868db7e7e859aaaa76b15e559e
Reviewed-on: https://gerrit.libreoffice.org/50023
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source/control/scriptedtext.cxx')
| -rw-r--r-- | svtools/source/control/scriptedtext.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 4a9b204646cf..9d06321e42a5 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -130,18 +130,18 @@ void SvtScriptedTextHelper_Impl::CalculateSizes() SetOutDevFont( nScript ); nCurrWidth = mrOutDevice.GetTextWidth( maText, nThisPos, nNextPos - nThisPos ); maWidthVec.push_back( nCurrWidth ); - maTextSize.Width() += nCurrWidth; + maTextSize.AdjustWidth(nCurrWidth ); nThisPos = nNextPos; } } // calculate maximum font height SetOutDevFont( i18n::ScriptType::LATIN ); - maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.setHeight( std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ) ); SetOutDevFont( i18n::ScriptType::ASIAN ); - maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.setHeight( std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ) ); SetOutDevFont( i18n::ScriptType::COMPLEX ); - maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.setHeight( std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ) ); mrOutDevice.Pop(); } @@ -263,8 +263,8 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) SetOutDevFont( nScript ); mrOutDevice.DrawText( aCurrPos, maText, nThisPos, nNextPos - nThisPos ); - aCurrPos.X() += maWidthVec[ nVecIndex++ ]; - aCurrPos.X() += mrOutDevice.GetTextHeight() / 5; // add 20% of font height as portion spacing + aCurrPos.AdjustX(maWidthVec[ nVecIndex++ ] ); + aCurrPos.AdjustX(mrOutDevice.GetTextHeight() / 5 ); // add 20% of font height as portion spacing nThisPos = nNextPos; } |