sackley     2004/03/22 21:51:50

  Modified:    src/scratchpad/src/org/apache/poi/hwpf HWPFDocument.java
  Log:
  Applied patches from Piers and my latest changes
  
  Revision  Changes    Path
  1.10      +44 -54    
jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
  
  Index: HWPFDocument.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HWPFDocument.java 15 Mar 2004 02:57:35 -0000      1.9
  +++ HWPFDocument.java 23 Mar 2004 05:51:50 -0000      1.10
  @@ -1,57 +1,20 @@
  -/*
  - *  ====================================================================
  - *  The Apache Software License, Version 1.1
  - *
  - *  Copyright (c) 2003 The Apache Software Foundation.  All rights
  - *  reserved.
  - *
  - *  Redistribution and use in source and binary forms, with or without
  - *  modification, are permitted provided that the following conditions
  - *  are met:
  - *
  - *  1. Redistributions of source code must retain the above copyright
  - *  notice, this list of conditions and the following disclaimer.
  - *
  - *  2. Redistributions in binary form must reproduce the above copyright
  - *  notice, this list of conditions and the following disclaimer in
  - *  the documentation and/or other materials provided with the
  - *  distribution.
  - *
  - *  3. The end-user documentation included with the redistribution,
  - *  if any, must include the following acknowledgment:
  - *  "This product includes software developed by the
  - *  Apache Software Foundation (http://www.apache.org/)."
  - *  Alternately, this acknowledgment may appear in the software itself,
  - *  if and wherever such third-party acknowledgments normally appear.
  - *
  - *  4. The names "Apache" and "Apache Software Foundation" and
  - *  "Apache POI" must not be used to endorse or promote products
  - *  derived from this software without prior written permission. For
  - *  written permission, please contact [EMAIL PROTECTED]
  - *
  - *  5. Products derived from this software may not be called "Apache",
  - *  "Apache POI", nor may "Apache" appear in their name, without
  - *  prior written permission of the Apache Software Foundation.
  - *
  - *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - *  SUCH DAMAGE.
  - *  ====================================================================
  - *
  - *  This software consists of voluntary contributions made by many
  - *  individuals on behalf of the Apache Software Foundation.  For more
  - *  information on the Apache Software Foundation, please see
  - *  <http://www.apache.org/>.
  - */
  +/* ====================================================================
  +   Copyright 2002-2004   Apache Software Foundation
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License.
  +==================================================================== */
  +
  +
   package org.apache.poi.hwpf;
   
   import java.io.InputStream;
  @@ -61,6 +24,8 @@
   import java.io.ByteArrayInputStream;
   import java.io.FileOutputStream;
   
  +import java.util.Iterator;
  +
   import org.apache.poi.poifs.filesystem.POIFSFileSystem;
   import org.apache.poi.poifs.filesystem.DocumentEntry;
   import org.apache.poi.poifs.common.POIFSConstants;
  @@ -122,6 +87,7 @@
     /** Holds fonts for this document.*/
     private FontTable _ft;
   
  +  /** Hold list tables */
     private ListTables _lt;
   
   
  @@ -226,6 +192,24 @@
       return new Range(0, p.getEnd(), this);
     }
   
  +  /**
  +   * Returns the character length of a document.
  +   * @return
  +   */
  +  public int characterLength()
  +  {
  +    java.util.List textPieces = _tpt.getTextPieces();
  +    Iterator textIt = textPieces.iterator();
  +
  +    int length = 0;
  +    while(textIt.hasNext())
  +    {
  +      TextPiece tp = (TextPiece)textIt.next();
  +      length += tp.characterLength();
  +    }
  +    return length;
  +  }
  +
     public ListTables getListTables()
     {
       return _lt;
  @@ -404,6 +388,12 @@
     public FontTable getFontTable()
     {
       return _ft;
  +  }
  +
  +  public void delete(int start, int length)
  +  {
  +    Range r = new Range(start, start + length, this);
  +    r.delete();
     }
   
     /**
  
  
  

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

Reply via email to