[Libreoffice-commits] core.git: sw/source

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Sun Mar 17 23:07:32 PDT 2013


 sw/source/filter/ww8/writerhelper.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 707bd4dfe85514418aaffa3ee9ece10b356abf51
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Mar 17 19:41:29 2013 +0100

    WaE: control might reach end of non-void function ... being inlined
    
    The warning is bogus, but the change is minimal
    
    Change-Id: I2bc6ec57d271e14e5abe8f152338626771458fb5
    Reviewed-on: https://gerrit.libreoffice.org/2803
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 3d45b43..4768a3e 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -182,8 +182,8 @@ namespace sw
                 return (maGrf == rOther.maGrf);
             else if ((!mbForBullet) && (!rOther.mbForBullet))
                 return (mpFlyFrm == rOther.mpFlyFrm);
-            else
-                return false;
+
+            return false;
         }
 
         /** The Size of the contained element


More information about the Libreoffice-commits mailing list