[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - svtools/source

[Eike Rathke]

 svtools/source/contnr/imivctl1.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d4814ca36e52da3681fb369277243ae193085cc
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Oct 7 21:51:26 2013 +0200

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 5e259fb8bb36d287e8986cf0c9695bcb75b9e70c)
    Reviewed-on: https://gerrit.libreoffice.org/6222
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index f363a0f..9d5478d 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;