Kaydet (Commit) 9eabc1fc authored tarafından Robert Antoni Buj i Gelonch's avatar Robert Antoni Buj i Gelonch Kaydeden (comit) Noel Grandin

java: Questionable use of non-short-circuit logic

Change-Id: Ied831cb5d6645e2696ff2d3d57843fc7a1f82f7e
Reviewed-on: https://gerrit.libreoffice.org/12137Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 1e7382cb
......@@ -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() ;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment