acoliver    2002/11/28 11:03:22

  Modified:    src/java/org/apache/poi/hssf/model Sheet.java
  Log:
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13483
  Patch from Jens Gerhard
  
  Revision  Changes    Path
  1.20      +4 -3      jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java
  
  Index: Sheet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Sheet.java        23 Nov 2002 18:58:52 -0000      1.19
  +++ Sheet.java        28 Nov 2002 19:03:22 -0000      1.20
  @@ -431,9 +431,10 @@
       }
   
       public int getNumMergedRegions()
  -    {
  -        return merged.getNumAreas();
  -    }
  +     {
  +         return merged!=null ? merged.getNumAreas() : 0;
  +     }
  +
   
       /**
        * This is basically a kludge to deal with the now obsolete Label records.  If
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to