diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-07 14:04:25 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-07 14:05:38 +0100 |
| commit | e5e201c87e3f7a3f0a0b6595cd235b697a310705 (patch) | |
| tree | f3c431f0906a66a518814fa4eea68d0277310b84 | |
| parent | 915ed57850aae12aed96bc66164bb15a6131f0f8 (diff) | |
Revert "sw android: fix -Werror,-Wsign-compare"
This helped Android, looked innocent, but breaks other platforms. It is
necessary to find out later how to address this while keeping everyone
else happy as well.
This reverts commit b64bf854909ce72fa6ea2db05c3aef8995cf32d6.
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 500791920e84..889aea171ce1 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3435,7 +3435,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, if( GetFrameFormat()->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE) && !rSz.GetWidthPercent() ) { - bRet = static_cast<size_t>(rSz.GetWidth()) < USHRT_MAX - nRelDiff; + bRet = rSz.GetWidth() < USHRT_MAX - nRelDiff; bChgLRSpace = bLeft ? rLR.GetLeft() >= nAbsDiff : rLR.GetRight() >= nAbsDiff; } @@ -3506,7 +3506,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, if( bBigger ) { // If the Table does not have any room to grow, we need to create some! - if( static_cast<size_t>(aSz.GetWidth()) + nRelDiff > USHRT_MAX ) + if( aSz.GetWidth() + nRelDiff > USHRT_MAX ) { // Break down to USHRT_MAX / 2 CR_SetBoxWidth aTmpPara( TableChgWidthHeightType::ColLeft, aSz.GetWidth() / 2, |