diff options
| author | Robert Antoni Buj i Gelonch <robert.buj@gmail.com> | 2014-10-29 17:11:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-30 08:49:01 +0000 |
| commit | 9eabc1fc3b2efa3303860d33dddd013f39582861 (patch) | |
| tree | b5f7788c4fa3bab2ce7b0eb882998b024573c62c /wizards | |
| parent | 1e7382cb45759908cd3d639c839dcd5633dbadd1 (diff) | |
java: Questionable use of non-short-circuit logic
Change-Id: Ied831cb5d6645e2696ff2d3d57843fc7a1f82f7e
Reviewed-on: https://gerrit.libreoffice.org/12137
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 00319ce2f856..fb1687a578a4 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; |