2004-04-09 09:05:39 -04:00
|
|
|
/* ====================================================================
|
2006-12-22 14:18:16 -05:00
|
|
|
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
|
2004-04-09 09:05:39 -04:00
|
|
|
|
|
|
|
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.
|
|
|
|
==================================================================== */
|
2009-05-19 15:21:12 -04:00
|
|
|
|
2004-04-09 07:45:38 -04:00
|
|
|
package org.apache.poi.ddf;
|
|
|
|
|
|
|
|
import org.apache.poi.util.HexDump;
|
|
|
|
import org.apache.poi.util.LittleEndian;
|
2008-07-21 05:34:08 -04:00
|
|
|
import org.apache.poi.util.RecordFormatException;
|
2004-04-09 07:45:38 -04:00
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This record defines the drawing groups used for a particular sheet.
|
|
|
|
*/
|
2009-05-19 15:21:12 -04:00
|
|
|
public final class EscherDggRecord extends EscherRecord {
|
2004-04-09 07:45:38 -04:00
|
|
|
public static final short RECORD_ID = (short) 0xF006;
|
|
|
|
public static final String RECORD_DESCRIPTION = "MsofbtDgg";
|
|
|
|
|
|
|
|
private int field_1_shapeIdMax;
|
|
|
|
// private int field_2_numIdClusters; // for some reason the number of clusters is actually the real number + 1
|
|
|
|
private int field_3_numShapesSaved;
|
|
|
|
private int field_4_drawingsSaved;
|
|
|
|
private FileIdCluster[] field_5_fileIdClusters;
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
private int maxDgId;
|
2004-04-09 07:45:38 -04:00
|
|
|
|
|
|
|
public static class FileIdCluster
|
|
|
|
{
|
|
|
|
public FileIdCluster( int drawingGroupId, int numShapeIdsUsed )
|
|
|
|
{
|
|
|
|
this.field_1_drawingGroupId = drawingGroupId;
|
|
|
|
this.field_2_numShapeIdsUsed = numShapeIdsUsed;
|
|
|
|
}
|
|
|
|
|
|
|
|
private int field_1_drawingGroupId;
|
|
|
|
private int field_2_numShapeIdsUsed;
|
|
|
|
|
|
|
|
public int getDrawingGroupId()
|
|
|
|
{
|
|
|
|
return field_1_drawingGroupId;
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getNumShapeIdsUsed()
|
|
|
|
{
|
|
|
|
return field_2_numShapeIdsUsed;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void incrementShapeId( )
|
|
|
|
{
|
|
|
|
this.field_2_numShapeIdsUsed++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
|
2004-04-09 07:45:38 -04:00
|
|
|
int bytesRemaining = readHeader( data, offset );
|
|
|
|
int pos = offset + 8;
|
|
|
|
int size = 0;
|
|
|
|
field_1_shapeIdMax = LittleEndian.getInt( data, pos + size );size+=4;
|
2009-05-19 15:21:12 -04:00
|
|
|
LittleEndian.getInt( data, pos + size );size+=4; // field_2_numIdClusters
|
2004-04-09 07:45:38 -04:00
|
|
|
field_3_numShapesSaved = LittleEndian.getInt( data, pos + size );size+=4;
|
|
|
|
field_4_drawingsSaved = LittleEndian.getInt( data, pos + size );size+=4;
|
2005-05-01 07:26:18 -04:00
|
|
|
field_5_fileIdClusters = new FileIdCluster[(bytesRemaining-size) / 8]; // Can't rely on field_2_numIdClusters
|
|
|
|
for (int i = 0; i < field_5_fileIdClusters.length; i++)
|
2004-04-09 07:45:38 -04:00
|
|
|
{
|
|
|
|
field_5_fileIdClusters[i] = new FileIdCluster(LittleEndian.getInt( data, pos + size ), LittleEndian.getInt( data, pos + size + 4 ));
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
maxDgId = Math.max(maxDgId, field_5_fileIdClusters[i].getDrawingGroupId());
|
2004-04-09 07:45:38 -04:00
|
|
|
size += 8;
|
|
|
|
}
|
|
|
|
bytesRemaining -= size;
|
|
|
|
if (bytesRemaining != 0)
|
|
|
|
throw new RecordFormatException("Expecting no remaining data but got " + bytesRemaining + " byte(s).");
|
|
|
|
return 8 + size + bytesRemaining;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
|
2004-04-09 07:45:38 -04:00
|
|
|
listener.beforeRecordSerialize( offset, getRecordId(), this );
|
|
|
|
|
|
|
|
int pos = offset;
|
|
|
|
LittleEndian.putShort( data, pos, getOptions() ); pos += 2;
|
|
|
|
LittleEndian.putShort( data, pos, getRecordId() ); pos += 2;
|
|
|
|
int remainingBytes = getRecordSize() - 8;
|
|
|
|
LittleEndian.putInt( data, pos, remainingBytes ); pos += 4;
|
2005-05-01 07:26:18 -04:00
|
|
|
|
2004-04-09 07:45:38 -04:00
|
|
|
LittleEndian.putInt( data, pos, field_1_shapeIdMax ); pos += 4;
|
|
|
|
LittleEndian.putInt( data, pos, getNumIdClusters() ); pos += 4;
|
|
|
|
LittleEndian.putInt( data, pos, field_3_numShapesSaved ); pos += 4;
|
|
|
|
LittleEndian.putInt( data, pos, field_4_drawingsSaved ); pos += 4;
|
2009-05-19 15:21:12 -04:00
|
|
|
for (int i = 0; i < field_5_fileIdClusters.length; i++) {
|
2004-04-09 07:45:38 -04:00
|
|
|
LittleEndian.putInt( data, pos, field_5_fileIdClusters[i].field_1_drawingGroupId ); pos += 4;
|
|
|
|
LittleEndian.putInt( data, pos, field_5_fileIdClusters[i].field_2_numShapeIdsUsed ); pos += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
listener.afterRecordSerialize( pos, getRecordId(), getRecordSize(), this );
|
|
|
|
return getRecordSize();
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int getRecordSize() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return 8 + 16 + (8 * field_5_fileIdClusters.length);
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public short getRecordId() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return RECORD_ID;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public String getRecordName() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return "Dgg";
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public String toString() {
|
|
|
|
|
2004-04-09 07:45:38 -04:00
|
|
|
StringBuffer field_5_string = new StringBuffer();
|
2009-06-20 07:17:30 -04:00
|
|
|
if(field_5_fileIdClusters != null) for (int i = 0; i < field_5_fileIdClusters.length; i++) {
|
2004-04-09 07:45:38 -04:00
|
|
|
field_5_string.append(" DrawingGroupId").append(i+1).append(": ");
|
|
|
|
field_5_string.append(field_5_fileIdClusters[i].field_1_drawingGroupId);
|
2009-05-19 15:21:12 -04:00
|
|
|
field_5_string.append('\n');
|
2004-04-09 07:45:38 -04:00
|
|
|
field_5_string.append(" NumShapeIdsUsed").append(i+1).append(": ");
|
|
|
|
field_5_string.append(field_5_fileIdClusters[i].field_2_numShapeIdsUsed);
|
2009-05-19 15:21:12 -04:00
|
|
|
field_5_string.append('\n');
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
2009-05-19 15:21:12 -04:00
|
|
|
return getClass().getName() + ":" + '\n' +
|
|
|
|
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
|
2011-08-31 09:14:09 -04:00
|
|
|
" Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
|
|
|
|
" Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
|
2009-05-19 15:21:12 -04:00
|
|
|
" ShapeIdMax: " + field_1_shapeIdMax + '\n' +
|
|
|
|
" NumIdClusters: " + getNumIdClusters() + '\n' +
|
|
|
|
" NumShapesSaved: " + field_3_numShapesSaved + '\n' +
|
|
|
|
" DrawingsSaved: " + field_4_drawingsSaved + '\n' +
|
2004-04-09 07:45:38 -04:00
|
|
|
"" + field_5_string.toString();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int getShapeIdMax() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return field_1_shapeIdMax;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The maximum is actually the next available. shape id.
|
|
|
|
*/
|
2009-05-19 15:21:12 -04:00
|
|
|
public void setShapeIdMax(int shapeIdMax) {
|
|
|
|
this.field_1_shapeIdMax = shapeIdMax;
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
|
|
|
|
2005-05-01 07:26:18 -04:00
|
|
|
/**
|
|
|
|
* Number of id clusters + 1
|
2009-05-19 15:21:12 -04:00
|
|
|
*/
|
|
|
|
public int getNumIdClusters() {
|
2009-06-20 07:17:30 -04:00
|
|
|
return (field_5_fileIdClusters == null ? 0 : (field_5_fileIdClusters.length + 1));
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int getNumShapesSaved() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return field_3_numShapesSaved;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public void setNumShapesSaved(int numShapesSaved) {
|
|
|
|
this.field_3_numShapesSaved = numShapesSaved;
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public int getDrawingsSaved() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return field_4_drawingsSaved;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public void setDrawingsSaved(int drawingsSaved) {
|
|
|
|
this.field_4_drawingsSaved = drawingsSaved;
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
/**
|
|
|
|
* @return The maximum drawing group ID
|
|
|
|
*/
|
2009-05-19 15:21:12 -04:00
|
|
|
public int getMaxDrawingGroupId() {
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
return maxDgId;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public void setMaxDrawingGroupId(int id) {
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 09:30:17 -04:00
|
|
|
maxDgId = id;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public FileIdCluster[] getFileIdClusters() {
|
2004-04-09 07:45:38 -04:00
|
|
|
return field_5_fileIdClusters;
|
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public void setFileIdClusters(FileIdCluster[] fileIdClusters) {
|
|
|
|
this.field_5_fileIdClusters = fileIdClusters;
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
|
|
|
|
2009-05-19 15:21:12 -04:00
|
|
|
public void addCluster(int dgId, int numShapedUsed) {
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
addCluster(dgId, numShapedUsed, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Add a new cluster
|
|
|
|
*
|
|
|
|
* @param dgId id of the drawing group (stored in the record options)
|
|
|
|
* @param numShapedUsed initial value of the numShapedUsed field
|
|
|
|
* @param sort if true then sort clusters by drawing group id.(
|
|
|
|
* In Excel the clusters are sorted but in PPT they are not)
|
|
|
|
*/
|
2009-05-19 15:21:12 -04:00
|
|
|
public void addCluster( int dgId, int numShapedUsed, boolean sort ) {
|
|
|
|
List<FileIdCluster> clusters = new ArrayList<FileIdCluster>(Arrays.asList(field_5_fileIdClusters));
|
2004-04-09 07:45:38 -04:00
|
|
|
clusters.add(new FileIdCluster(dgId, numShapedUsed));
|
2009-05-19 15:21:12 -04:00
|
|
|
if(sort) Collections.sort(clusters, MY_COMP );
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-653812 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r651992 | nick | 2008-04-27 19:02:13 +0100 (Sun, 27 Apr 2008) | 1 line
Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
........
r652285 | yegor | 2008-04-30 07:18:05 +0100 (Wed, 30 Apr 2008) | 1 line
start a new section for 3.1-beta2
........
r652288 | yegor | 2008-04-30 07:19:38 +0100 (Wed, 30 Apr 2008) | 1 line
correctly process PICT blips (see bug #44886)
........
r652290 | yegor | 2008-04-30 07:21:04 +0100 (Wed, 30 Apr 2008) | 1 line
more flexible creation of a cluster
........
r652292 | yegor | 2008-04-30 07:22:02 +0100 (Wed, 30 Apr 2008) | 1 line
a few more words in the release guide
........
r652298 | yegor | 2008-04-30 07:29:11 +0100 (Wed, 30 Apr 2008) | 1 line
more work on rendering ppt slides
........
r652329 | nick | 2008-04-30 12:10:49 +0100 (Wed, 30 Apr 2008) | 1 line
Tests to show that bugs 44891 and 44861 were both already fixed
........
r652426 | josh | 2008-05-01 04:25:37 +0100 (Thu, 01 May 2008) | 1 line
fixed bug 44892 - made HSSFWorkbook.getSheet(String) case insensitive
........
r652446 | josh | 2008-05-01 08:42:18 +0100 (Thu, 01 May 2008) | 1 line
44914 - Fix/suppress warning message - WARN. Unread n bytes of record 0xNN
........
r652561 | josh | 2008-05-01 16:46:21 +0100 (Thu, 01 May 2008) | 1 line
added disabled junit for bug 44916
........
r652934 | josh | 2008-05-02 23:36:49 +0100 (Fri, 02 May 2008) | 1 line
44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)
........
r652936 | josh | 2008-05-02 23:49:38 +0100 (Fri, 02 May 2008) | 1 line
should have been submitted with r652934
........
r652994 | josh | 2008-05-03 04:59:32 +0100 (Sat, 03 May 2008) | 1 line
Fixed 44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters
........
r653117 | josh | 2008-05-03 20:53:38 +0100 (Sat, 03 May 2008) | 1 line
44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file
........
r653125 | josh | 2008-05-03 21:13:56 +0100 (Sat, 03 May 2008) | 1 line
Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB)
........
r653484 | yegor | 2008-05-05 14:59:11 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653485 | yegor | 2008-05-05 14:59:38 +0100 (Mon, 05 May 2008) | 1 line
take into account indentation in HSSFSheet.autosizeColumn
........
r653486 | yegor | 2008-05-05 15:00:30 +0100 (Mon, 05 May 2008) | 1 line
getting ready to 3.1-beta2
........
r653520 | yegor | 2008-05-05 17:12:21 +0100 (Mon, 05 May 2008) | 1 line
bug #44235 is not reproducible in 3.1-beta1
........
r653521 | yegor | 2008-05-05 17:13:24 +0100 (Mon, 05 May 2008) | 1 line
restored mistakenly commented line
........
r653551 | josh | 2008-05-05 19:30:49 +0100 (Mon, 05 May 2008) | 1 line
Added test case method javadoc for old bug 44675
........
r653608 | josh | 2008-05-05 22:38:07 +0100 (Mon, 05 May 2008) | 1 line
Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes
........
r653668 | josh | 2008-05-06 03:02:41 +0100 (Tue, 06 May 2008) | 1 line
42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.
........
r653675 | josh | 2008-05-06 04:57:15 +0100 (Tue, 06 May 2008) | 1 line
42570 - fixed LabelRecord to use empty string instead of null when the length is zero.
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@653822 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 12:00:36 -04:00
|
|
|
maxDgId = Math.min(maxDgId, dgId);
|
2009-05-19 15:21:12 -04:00
|
|
|
field_5_fileIdClusters = clusters.toArray( new FileIdCluster[clusters.size()] );
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|
2009-05-19 15:21:12 -04:00
|
|
|
|
|
|
|
private static final Comparator<FileIdCluster> MY_COMP = new Comparator<FileIdCluster>() {
|
|
|
|
public int compare(FileIdCluster f1, FileIdCluster f2) {
|
|
|
|
if (f1.getDrawingGroupId() == f2.getDrawingGroupId()) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (f1.getDrawingGroupId() < f2.getDrawingGroupId()) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return +1;
|
|
|
|
}
|
|
|
|
};
|
2004-04-09 07:45:38 -04:00
|
|
|
}
|