CVS: jfor/src/org/jfor/jfor/rtflib/rtfdoc RtfTableRow.java,1.11,1.12

Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc
In directory sc8-pr-cvs1:/tmp/cvs-serv13694

Modified Files:
	RtfTableRow.java 
Log Message:
support for number-rows-spanned added

Index: RtfTableRow.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfTableRow.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RtfTableRow.java	27 Jun 2003 14:58:13 -0000	1.11
--- RtfTableRow.java	29 Jun 2003 22:36:24 -0000	1.12
***************
*** 62,65 ****
--- 62,68 ----
  // $Id$
  // $Log$
+ // Revision 1.12  2003/06/29 22:36:24  pherweg
+ // support for number-rows-spanned added
+ //
  // Revision 1.11  2003/06/27 14:58:13  pherweg
  // Bug repaired: Nested tables had caused a NullPointerException
***************
*** 155,159 ****
          return m_cell;
      }
! 
      /**
       * Added by Boris POUDEROUS on 07/02/2002
--- 158,162 ----
          return m_cell;
      }
!     
      /**
       * Added by Boris POUDEROUS on 07/02/2002
***************
*** 286,290 ****
                          else if (index < ((Integer)indexesFound.get(i)).intValue())
                            {
!                             ((RtfTableCell)e).setVMerge(RtfTableCell.MERGE_START);
                              break;
                            }
--- 289,294 ----
                          else if (index < ((Integer)indexesFound.get(i)).intValue())
                            {
!                             if(((RtfTableCell)e).getVMerge()!=RtfTableCell.MERGE_WITH_PREVIOUS)
!                                 ((RtfTableCell)e).setVMerge(RtfTableCell.MERGE_START);
                              break;
                            }
***************
*** 294,298 ****
                          else if (index > ((Integer)indexesFound.get(i)).intValue())
                            {
!                             ((RtfTableCell)e).setVMerge(RtfTableCell.MERGE_START);
                              break;
                            }
--- 298,303 ----
                          else if (index > ((Integer)indexesFound.get(i)).intValue())
                            {
!                             if(((RtfTableCell)e).getVMerge()!=RtfTableCell.MERGE_WITH_PREVIOUS)
!                                 ((RtfTableCell)e).setVMerge(RtfTableCell.MERGE_START);
                              break;
                            }



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01