diff --git a/src/documentation/content/xdocs/casestudies.xml b/src/documentation/content/xdocs/casestudies.xml index e10d90e0eb..ef0e987d65 100644 --- a/src/documentation/content/xdocs/casestudies.xml +++ b/src/documentation/content/xdocs/casestudies.xml @@ -132,7 +132,7 @@ format, reports financial statistical data to Excel format using the Apache POI project's - + HSSF API. The system is based on Oracle JServer and utilizes a Java stored procedure that outputs to XLS format using the HSSF API. - Arian Lashkov (alaskov at lbank.lt) diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index 4ed05d00f1..46b55c3ceb 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -36,6 +36,10 @@ + 45018 - Support for fetching embeded documents from within an OOXML file Port support for setting a policy on missing / blank cells when fetching, to XSSF too diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml index 22c1a4cb4d..8a5d51bb3f 100644 --- a/src/documentation/content/xdocs/faq.xml +++ b/src/documentation/content/xdocs/faq.xml @@ -181,7 +181,7 @@ System.out.println("Core POI came from " + path);

- Yes. You first need to get a HSSFDataFormat object from the workbook and call getFormat with the desired format. Some examples are here. + Yes. You first need to get a HSSFDataFormat object from the workbook and call getFormat with the desired format. Some examples are here.

diff --git a/src/documentation/content/xdocs/overview.xml b/src/documentation/content/xdocs/overview.xml index 53273adb1a..a8ce13f1cf 100644 --- a/src/documentation/content/xdocs/overview.xml +++ b/src/documentation/content/xdocs/overview.xml @@ -48,10 +48,11 @@

-
HSSF +
HSSF and XSSF

- HSSF is the set of APIs - for reading and writing Microsoft Excel 97(-XP) spreadsheets using (only) Java. + HSSF and XSSF are + the set of APIs for reading and writing Microsoft Excel + 97-2007 and OOXML spreadsheets using (only) Java.

diff --git a/src/documentation/content/xdocs/poi-ruby.xml b/src/documentation/content/xdocs/poi-ruby.xml index 6fe4e407e8..ce034b4447 100644 --- a/src/documentation/content/xdocs/poi-ruby.xml +++ b/src/documentation/content/xdocs/poi-ruby.xml @@ -110,7 +110,7 @@ h.write(File.new("test.xls","w"))

The tc_base_tests.rb file in the tests sub directory of the source distribution - contains examples of simple uses of the API. The quick quide is the best + contains examples of simple uses of the API. The quick quide is the best place to learn HSSF API use. (Note however that none of the Drawing features are implemented in the Ruby binding.) See also the POI API documentation for more details.

diff --git a/src/documentation/content/xdocs/poifs/embeded.xml b/src/documentation/content/xdocs/poifs/embeded.xml index a4620f5a94..2ffd9f6295 100644 --- a/src/documentation/content/xdocs/poifs/embeded.xml +++ b/src/documentation/content/xdocs/poifs/embeded.xml @@ -62,7 +62,7 @@

PowerPoint does not normally store embeded files in the OLE2 layer. Instead, they are held within records of the main PowerPoint file. -
See the HSLF Tutorial +
See the HSLF Tutorial for how to retrieve embedded OLE objects from a presentation

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index f96dfc33ab..31427e939e 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -33,6 +33,10 @@ + 45018 - Support for fetching embeded documents from within an OOXML file Port support for setting a policy on missing / blank cells when fetching, to XSSF too diff --git a/src/documentation/content/xdocs/trans/de/book.xml b/src/documentation/content/xdocs/trans/de/book.xml index cd403a6af4..641170ebab 100644 --- a/src/documentation/content/xdocs/trans/de/book.xml +++ b/src/documentation/content/xdocs/trans/de/book.xml @@ -31,7 +31,7 @@ - + diff --git a/src/documentation/content/xdocs/trans/de/index.xml b/src/documentation/content/xdocs/trans/de/index.xml index 84e4f4341c..d4e9a33fea 100644 --- a/src/documentation/content/xdocs/trans/de/index.xml +++ b/src/documentation/content/xdocs/trans/de/index.xml @@ -154,7 +154,7 @@ HSSF ist unsere Portierung des Microsoft Excel 97(-2002) Dateiformats in reinem Java. Es unterstützt Lesen und Schreiben. Mehr Informationen gibt es auf der - HSSF-Seite. + HSSF-Seite.

HWPF diff --git a/src/documentation/content/xdocs/trans/es/book.xml b/src/documentation/content/xdocs/trans/es/book.xml index 7c463a798a..3defdaf7eb 100644 --- a/src/documentation/content/xdocs/trans/es/book.xml +++ b/src/documentation/content/xdocs/trans/es/book.xml @@ -35,7 +35,7 @@ - + diff --git a/src/documentation/content/xdocs/trans/es/casestudies.xml b/src/documentation/content/xdocs/trans/es/casestudies.xml index 1a1962fbc3..769a5325b6 100644 --- a/src/documentation/content/xdocs/trans/es/casestudies.xml +++ b/src/documentation/content/xdocs/trans/es/casestudies.xml @@ -99,7 +99,7 @@ El Banco de Lituania genera informes de datos estadísticos financieros en formato Excel - utilizando el API + utilizando el API HSSF del proyecto Jakarta POI El sistema está basado en Oracle JServer y utiliza diff --git a/src/documentation/content/xdocs/trans/es/index.xml b/src/documentation/content/xdocs/trans/es/index.xml index 5eca17f70b..7ec2685136 100644 --- a/src/documentation/content/xdocs/trans/es/index.xml +++ b/src/documentation/content/xdocs/trans/es/index.xml @@ -86,7 +86,7 @@
HSSF

HSSF es nuestra adaptación del formato de fichero de Microsoft Excel 97(-2002) (BIFF8) a Java puro. Soporta lectura y - escritura. Por favor, vea la página del proyecto HSSF [EN] para más información.

+ escritura. Por favor, vea la página del proyecto HSSF [EN] para más información.

HWPF

HWPF es nuestra adaptación del formato de fichero de Microsoft Word 97 a Java puro. Soporta lectura y escritura. diff --git a/src/documentation/content/xdocs/trans/es/overview.xml b/src/documentation/content/xdocs/trans/es/overview.xml index ba7b3b5a8d..b971ec814a 100644 --- a/src/documentation/content/xdocs/trans/es/overview.xml +++ b/src/documentation/content/xdocs/trans/es/overview.xml @@ -50,7 +50,7 @@

HSSF

- HSSF [EN] es el conjunto de APIs para la lectura y + HSSF [EN] es el conjunto de APIs para la lectura y escritura de hojas de cálculo de Microsoft Excel 97(-XP) utilizando (únicamente) Java.

diff --git a/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Iterable.java b/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Iterable.java new file mode 100644 index 0000000000..17a2820c8c --- /dev/null +++ b/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Iterable.java @@ -0,0 +1,30 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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.ss.usermodel; + +import java.util.Iterator; + +/** + * Workaround for java.lang.Iterable not existing on java 1.4, but + * people wanting to use it all the same. + * Must only be present for java 1.4 interfaces! Do not add for + * java 1.5, as that has its own real one from java.lang + */ +public interface Iterable { + public Iterator iterator(); +}