[Libreoffice-commits] core.git: qadevOOo/runner wizards/com

[Robert Antoni Buj i Gelonch]

 qadevOOo/runner/util/XMLTools.java                                         |    3 ++-
 wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9eabc1fc3b2efa3303860d33dddd013f39582861
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Wed Oct 29 17:11:50 2014 +0100

    java: Questionable use of non-short-circuit logic
    
    Change-Id: Ied831cb5d6645e2696ff2d3d57843fc7a1f82f7e
    Reviewed-on: https://gerrit.libreoffice.org/12137
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index 7dea190..64330a1 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -424,7 +424,8 @@ public class XMLTools {
         * all necessary tags and character data was found.
         */
         public boolean checkTags() {
-            allOK &= isWellFormed() ;
+            if (!isWellFormed())
+                allOK = false ;
 
             Iterator<String> badTags = tags.keySet().iterator() ;
             Iterator<String> badChars = chars.keySet().iterator() ;
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
index 00319ce..fb1687a 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
@@ -118,7 +118,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns
             aRectFields = insertFormattedField(xSection, sFieldName, aRectFields, nFieldWidth, aSOTextField);
             nLastHeight = Math.max(nLastHeight, aRectFields.Height);
             int nNextX = aRectFields.X + nFieldWidth;
-            if (nNextX > (getPageWidth() - getRightPageIndent()) & nCount > 1)
+            if ((nNextX > (getPageWidth() - getRightPageIndent())) && nCount > 1)
             {
                 int nHeight = (aSOLabel.getHeight(LayoutConstants.LabelHeight) + Math.max(aSOTextField.getHeight(LayoutConstants.FormattedFieldHeight), nLastHeight));
                 nLastHeight = 0;