svtools/source/control/ctrltool.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit df45d9d1c037b27291c2173c4d0bfa6e3a42a73f
Author: LuboÅ¡ Luňák <[email protected]>
Date:   Wed May 9 19:19:11 2012 +0200

    work around -Wreturn-type with compilers that cannot figure it out 
themselves

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index ffa4fbb..8561167 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -126,12 +126,11 @@ private:
 //sort normal to the start
 static int sortWeightValue(FontWeight eWeight)
 {
-    if (eWeight == WEIGHT_NORMAL)
-        return 0;
     if (eWeight < WEIGHT_NORMAL)
         return eWeight + 1;
     if (eWeight > WEIGHT_NORMAL)
         return eWeight - 1;
+    return 0; // eWeight == WEIGHT_NORMAL
 }
 
 static StringCompare ImplCompareFontInfo( ImplFontListFontInfo* pInfo1,
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to