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

Caolán McNamara caolanm at redhat.com
Tue Nov 11 09:26:47 PST 2014


 sw/source/core/text/frmform.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 08243fbab68e503241d158525f88c051bffb189e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 11 16:34:35 2014 +0000

    coverity#1242754 Unused value
    
    Change-Id: I5e3d39b8f87e1496550c616928eab9166f624387
    Reviewed-on: https://gerrit.libreoffice.org/12364
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 98d6079..24a66c8 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1370,8 +1370,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
         rLine.TruncLines();
 
         // Play it safe
-        bBreak = aFrmBreak.IsBreakNowWidAndOrp(rLine) &&
-                  ( !pPara->IsPrepMustFit() || rLine.GetLineNr() > 1 );
+        aFrmBreak.IsBreakNowWidAndOrp(rLine);
     }
 
  /* Meaning if the following flags are set:


More information about the Libreoffice-commits mailing list