[libreoffice] fix annoying compiler warning

David Tardon dtardon at fedoraproject.org
Wed Oct 9 16:30:26 UTC 2013


commit 1b4e7511b710b972505adfe2d581b1accddf3618
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 9 18:30:10 2013 +0200

    fix annoying compiler warning

 ...-overflow-assuming-signed-overflow-does-n.patch |   33 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/0001-WaE-Wstrict-overflow-assuming-signed-overflow-does-n.patch b/0001-WaE-Wstrict-overflow-assuming-signed-overflow-does-n.patch
new file mode 100644
index 0000000..4c416c7
--- /dev/null
+++ b/0001-WaE-Wstrict-overflow-assuming-signed-overflow-does-n.patch
@@ -0,0 +1,33 @@
+From ca576e0804324bbb36b697543cbe992e34d4b951 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack at redhat.com>
+Date: Mon, 7 Oct 2013 21:51:26 +0200
+Subject: [PATCH] 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
+---
+ svtools/source/contnr/imivctl1.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
+index 1cd006b..0685bc3 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;
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 6dce751..b7cdcdb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -267,6 +267,7 @@ Patch26: 0001-rhbz-1001768-avoid-deadlock-in-OAccessibleContextHel.patch
 Patch27: 0001-rhbz-1001768-AtkListener-disposing-delay-notificatio.patch
 Patch28: 0001-fdo-69384-fix-impress-writer-copy-paste.patch
 Patch29: 0001-fdo-70201-sw-eliminate-no-extent-RSID-only-AUTOFMT-h.patch
+Patch30: 0001-WaE-Wstrict-overflow-assuming-signed-overflow-does-n.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1028,6 +1029,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch27 -p1 -b .rhbz-1001768-AtkListener-disposing-delay-notificatio.patch
 %patch28 -p1 -b .fdo-69384-fix-impress-writer-copy-paste.patch
 %patch29 -p1 -b .fdo-70201-sw-eliminate-no-extent-RSID-only-AUTOFMT-h.patch
+%patch30 -p1 -b .WaE-Wstrict-overflow-assuming-signed-overflow-does-n.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english


More information about the scm-commits mailing list