From 41fded57629ce1c14d806c0f37c18540ad2cf613 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 21 Jan 2019 16:52:30 +0100 Subject: Simplify nXWidth initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...which happens to avoid an unhelpful -Werror=strict-overflow with GCC 7 and --enable-optimized: > vcl/source/edit/texteng.cxx: In member function ‘bool TextEngine::CreateLines(sal_uInt32)’: > vcl/source/edit/texteng.cxx:2197:9: error: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Werror=strict-overflow] > if ( nTmpWidth > nXWidth ) > ^~ Change-Id: Ia87933da6e38b8b462d2ea34c3db6a84c5840f92 Reviewed-on: https://gerrit.libreoffice.org/66690 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/source/edit/texteng.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vcl/source/edit') diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index c4402d48924b..2c8e320468b0 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2148,9 +2148,8 @@ bool TextEngine::CreateLines( sal_uInt32 nPara ) std::size_t nTmpPortion = pLine->GetStartPortion(); long nTmpWidth = mpDoc->GetLeftMargin(); // do not subtract margin; it is included in TmpWidth - long nXWidth = mnMaxTextWidth ? mnMaxTextWidth : std::numeric_limits::max(); - if ( nXWidth < nTmpWidth ) - nXWidth = nTmpWidth; + long nXWidth = std::max( + mnMaxTextWidth ? mnMaxTextWidth : std::numeric_limits::max(), nTmpWidth); // search for Portion that does not fit anymore into line TETextPortion* pPortion = nullptr; -- cgit