moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

apply fixes from trunk 

git-svn-id: https://svn.apache.org/repos/asf/poi/tags/REL_3_7@1026381 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2010-10-22 15:49:12 +00:00
parent 9182c4a6d8
commit de68d3da62
19 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legal/RELEASE_NOTES.txt
View File

@ -5,9 +5,11 @@ See the downloads page for binary and source distributions: http://poi.apache.or
Release Notes -- Apache POI -- Version 3.7 Release Notes -- Apache POI -- Version 3.7
Apache POI is an open source Java library for working with Microsoft Office documents. POI 3.7 is an incremental feature release based on the earlier 3.6 release. The most notable changes since POI 3.6 are: Apache POI is an open source Java library for working with Microsoft Office documents.
POI 3.7 is an incremental feature release based on the earlier 3.6 release.
The most notable changes since POI 3.6 are:
-------------------------------------------
OOXML OOXML
* support for reading aes-encrypted/write-protected ooxml files * support for reading aes-encrypted/write-protected ooxml files
* support Java 1.5 in auto-generated xmlbeans for ooxml schemas * support Java 1.5 in auto-generated xmlbeans for ooxml schemas
@ -21,7 +23,7 @@ Spreadsheet (Excel)
* numerous fixes and performance optimizations in the Formula Evaluation module * numerous fixes and performance optimizations in the Formula Evaluation module
* ability to add, modify and remove series from HSSF Charts * ability to add, modify and remove series from HSSF Charts
* numerous improvements in the cell data formatter (handling more formatting rules, better color detection, allow overriding of default locale) * numerous improvements in the cell data formatter (handling more formatting rules, better color detection, allow overriding of default locale)
* more examples including a rich "spreadsheet to HTML" convertor * more examples including a rich "spreadsheet to HTML" converter
Document (Word) Document (Word)
* initial support for the HWPF revision marks authors list * initial support for the HWPF revision marks authors list
@ -86,8 +88,8 @@ Release Contents
This release comes in two forms: This release comes in two forms:
- pre-built binaries containing compiled versions of all Apache POI components and documentation - pre-built binaries containing compiled versions of all Apache POI components and documentation
(poi-bin-3.7-20101025.zip or poi-bin-3.7-20101025.tar.gz) (poi-bin-3.7-20101029.zip or poi-bin-3.7-20101029.tar.gz)
- source archive you can build POI from (poi-src-3.7-20101025.zip or poi-src-3.7-20101025.tar.gz) - source archive you can build POI from (poi-src-3.7-20101029.zip or poi-src-3.7-20101029.tar.gz)
Pre-built versions of all POI components are also available in the central Maven repository Pre-built versions of all POI components are also available in the central Maven repository
under Group ID "org.apache.poi" and Version "3.7" under Group ID "org.apache.poi" and Version "3.7"

2
src/documentation/content/xdocs/index.xml
View File

@ -32,7 +32,7 @@
</header> </header>
<body> <body>
<section><title>15 October 2010 - POI 3.7 available</title> <section><title>29 October 2010 - POI 3.7 available</title>
<p>The Apache POI team is pleased to announce the release of POI 3.7. See the <p>The Apache POI team is pleased to announce the release of POI 3.7. See the
<link href="http://www.apache.org/dist/poi/release/bin/RELEASE-NOTES.txt">full release notes</link> for more details. <link href="http://www.apache.org/dist/poi/release/bin/RELEASE-NOTES.txt">full release notes</link> for more details.
</p> </p>

2
src/documentation/content/xdocs/status.xml
View File

@ -33,7 +33,7 @@
</developers> </developers>
<changes> <changes>
<release version="3.7" date="2010-10-25"> <release version="3.7" date="2010-10-29">
<action dev="poi-developers" type="fix">50075 - avoid NPE in ListLevel.getNumberText() when numberText is null </action> <action dev="poi-developers" type="fix">50075 - avoid NPE in ListLevel.getNumberText() when numberText is null </action>
<action dev="poi-developers" type="fix">50067 - marked commons-logging and log4j as optional dependencies in POI poms</action> <action dev="poi-developers" type="fix">50067 - marked commons-logging and log4j as optional dependencies in POI poms</action>
<action dev="poi-developers" type="add">49928 - allow overridden built-in formats in XSSFCellStyle</action> <action dev="poi-developers" type="add">49928 - allow overridden built-in formats in XSSFCellStyle</action>

2
src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

2
src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.io.*; import java.io.*;
import org.apache.poi.poifs.filesystem.*; import org.apache.poi.poifs.filesystem.*;

2
src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;

2
src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;

2
src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;

2
src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;

2
src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;

2
src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.poibrowser; package org.apache.poi.poifs.poibrowser;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;

2
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
View File

@ -1594,8 +1594,6 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
// TODO: Some kind of structure. // TODO: Some kind of structure.
HSSFPictureData picture = new HSSFPictureData(blip); HSSFPictureData picture = new HSSFPictureData(blip);
pictures.add(picture); pictures.add(picture);
} else {
pictures.add(null);
} }

4
src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hssf.usermodel.contrib; package org.apache.poi.hssf.util;
import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCell;
@ -24,7 +24,7 @@ import org.apache.poi.hssf.usermodel.HSSFFont;
import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.contrib.CellUtil; import org.apache.poi.ss.util.CellUtil;
/** /**
* Various utility functions that make working with a cells and rows easier. The various * Various utility functions that make working with a cells and rows easier. The various

4
src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hssf.usermodel.contrib; package org.apache.poi.hssf.util;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.contrib.RegionUtil; import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.Region; import org.apache.poi.ss.util.Region;

2
src/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.ss.usermodel.contrib; package org.apache.poi.ss.util;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

3
src/java/org/apache/poi/ss/util/RegionUtil.java
View File

@ -15,13 +15,12 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.ss.usermodel.contrib; package org.apache.poi.ss.util;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
/** /**
* Various utility functions that make working with a region of cells easier. * Various utility functions that make working with a region of cells easier.

2
src/java/org/apache/poi/util/FontMetricsDumper.java
View File

@ -16,7 +16,7 @@
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.contrib.metrics; package org.apache.poi.util;
import java.awt.*; import java.awt.*;
import java.io.FileOutputStream; import java.io.FileOutputStream;

12
src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
View File

@ -71,4 +71,16 @@ public final class TestHSSFPictureData extends TestCase{
} }
} }
} }
public void testNotNullPictures() throws IOException {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
@SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures()
List<HSSFPictureData> lst = (List<HSSFPictureData>)(List<?>)wb.getAllPictures();
for(HSSFPictureData pict : lst){
assertNotNull(pict);
}
}
} }