summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-07 21:51:26 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-08 14:59:13 +0000
commit5e259fb8bb36d287e8986cf0c9695bcb75b9e70c (patch)
tree2457729275a327c6759fb59c7dd17dd065d43ba7
parentfe4ec778164c8420c187b13c31a44b40622c159a (diff)
WaE [-Wstrict-overflow] assuming signed overflow does not occur
... when assuming that (X - c) <= X is always true ... or that (X + c) < X is always false Change-Id: Ib2313827cd6358ced0141b41cba753896b676e28 (cherry picked from commit ca576e0804324bbb36b697543cbe992e34d4b951) Reviewed-on: https://gerrit.libreoffice.org/6159 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--svtools/source/contnr/imivctl1.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index f363a0faa7d5..9d5478dc1504 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2710,9 +2710,9 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry
Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1,
aBoundRect.Right() - 4, aTextRect.Bottom() + 1 );
// the focus rectangle should not touch the text
- if( aFocusRect.Left() - 1 >= pEntry->aRect.Left() )
+ if( aFocusRect.Left() > ::std::numeric_limits<long>::min() && aFocusRect.Left() - 1 >= pEntry->aRect.Left() )
aFocusRect.Left()--;
- if( aFocusRect.Right() + 1 <= pEntry->aRect.Right() )
+ if( aFocusRect.Right() < ::std::numeric_limits<long>::max() && aFocusRect.Right() + 1 <= pEntry->aRect.Right() )
aFocusRect.Right()++;
return aFocusRect;