Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 50034 invoked from network); 20 Jun 2005 13:25:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jun 2005 13:25:07 -0000 Received: (qmail 27843 invoked by uid 500); 20 Jun 2005 13:25:02 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 27810 invoked by uid 500); 20 Jun 2005 13:25:01 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 27782 invoked by uid 500); 20 Jun 2005 13:25:01 -0000 Delivered-To: apmail-xml-fop-cvs@apache.org Received: (qmail 27765 invoked by uid 99); 20 Jun 2005 13:25:01 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 20 Jun 2005 06:25:01 -0700 Received: (qmail 49735 invoked by uid 1482); 20 Jun 2005 13:24:21 -0000 Date: 20 Jun 2005 13:24:21 -0000 Message-ID: <20050620132421.49734.qmail@minotaur.apache.org> From: jeremias@apache.org To: xml-fop-cvs@apache.org Subject: cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table CollapsingBorderModelEyeCatching.java GridUnit.java X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N jeremias 2005/06/20 06:24:21 Modified: src/java/org/apache/fop/layoutmgr/table CollapsingBorderModelEyeCatching.java GridUnit.java Log: Fixes NPEs when a table is using collapsing border model in conjunction with empty cells. Revision Changes Path 1.3 +4 -3 xml-fop/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java Index: CollapsingBorderModelEyeCatching.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CollapsingBorderModelEyeCatching.java 13 May 2005 19:16:54 -0000 1.2 +++ CollapsingBorderModelEyeCatching.java 20 Jun 2005 13:24:21 -0000 1.3 @@ -96,10 +96,11 @@ //row other[1] = otherRow.getCommonBorderPaddingBackground().getBorderInfo(otherSide); } - if ((side == BEFORE && currentGridUnit.getFlag(GridUnit.FIRST_IN_BODY)) + if (currentBody != null + && ((side == BEFORE && currentGridUnit.getFlag(GridUnit.FIRST_IN_BODY)) || (side == AFTER && currentGridUnit.getFlag(GridUnit.LAST_IN_BODY)) || (currentGridUnit.getFlag(GridUnit.IN_FIRST_COLUMN) && side == START) - || (currentGridUnit.getFlag(GridUnit.IN_LAST_COLUMN) && side == END)) { + || (currentGridUnit.getFlag(GridUnit.IN_LAST_COLUMN) && side == END))) { //row group (=body, table-header or table-footer) current[2] = currentBody.getCommonBorderPaddingBackground().getBorderInfo(side); } 1.5 +4 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/GridUnit.java Index: GridUnit.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/GridUnit.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- GridUnit.java 30 May 2005 09:11:10 -0000 1.4 +++ GridUnit.java 20 Jun 2005 13:24:21 -0000 1.5 @@ -125,6 +125,9 @@ while (node != null && !(node instanceof Table)) { node = node.getParent(); } + if (node == null && getColumn() != null) { + node = getColumn().getParent(); + } return (Table)node; } --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org