Attachment #24900 for bug #44916

View | Details | Raw Unified | Return to bug 44916
Collapse All | Expand All

Lines 2010-2015 Link Here

(-)src/java/org/apache/poi/hssf/model/InternalWorkbook.java (+1 lines)
2010	* Finds the primary drawing group, if one already exists	2010	* Finds the primary drawing group, if one already exists
2011	*/	2011	*/
2012	public void findDrawingGroup() {	2012	public void findDrawingGroup() {
		2013	if(drawingManager != null) return;
2013	// Need to find a DrawingGroupRecord that	2014	// Need to find a DrawingGroupRecord that
2014	// contains a EscherDggRecord	2015	// contains a EscherDggRecord
2015	for(Iterator<Record> rit = records.iterator(); rit.hasNext();) {	2016	for(Iterator<Record> rit = records.iterator(); rit.hasNext();) {

Lines 53-58 Link Here

(-)src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java (+1 lines)
53	public AbstractEscherHolderRecord()	53	public AbstractEscherHolderRecord()
54	{	54	{
55	escherRecords = new ArrayList<EscherRecord>();	55	escherRecords = new ArrayList<EscherRecord>();
		56	rawData = new byte[0];
56	}	57	}
57		58
58	public AbstractEscherHolderRecord(RecordInputStream in)	59	public AbstractEscherHolderRecord(RecordInputStream in)




 * @author  Yegor Kozlov (yegor at apache.org) (Autosizing columns)
 * @author  Josh Micich
 * @author  Petr Udalau(Petr.Udalau at exigenservices.com) - set/remove array formulas
 * @author  Pierre Tholence (bug fix)
 */
public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
    private static final POILogger log = POILogFactory.getLogger(HSSFSheet.class);

    protected final HSSFWorkbook _workbook;
    private int _firstrow;
    private int _lastrow;
    private HSSFPatriarch _patriarch;

    /**
     * Creates new HSSFSheet   - called by HSSFWorkbook to create a sheet from

        agg.clear();     // Initially the behaviour will be to clear out any existing shapes in the sheet when
                         // creating a new patriarch.
        agg.setPatriarch(patriarch);
        _patriarch = patriarch;
        return patriarch;
    }


     *  start from scratch!
     */
    public HSSFPatriarch getDrawingPatriarch() {
    	if(_patriarch != null) return _patriarch;
    	
        EscherAggregate agg = getDrawingEscherAggregate();
        if(agg == null) return null;


        //  that isn't supported, you were warned...)
        agg.convertRecordsToUserModel();

        _patriarch = patriarch;
        // Return what we could cope with
        return patriarch;
    }

Lines 24-29 Link Here

(-)src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java (-2 / +2 lines)
24		24
25	/**	25	/**
26	* @author Josh Micich	26	* @author Josh Micich
		27	* @author Pierre Tholence
27	*/	28	*/
28	public final class TestHSSFPatriarch extends TestCase {	29	public final class TestHSSFPatriarch extends TestCase {
29		30
Lines 38-45 Link Here
38	// assert something more interesting	39	// assert something more interesting
39	}	40	}
40		41
41	// TODO - fix bug 44916 (1-May-2008)	42	public void test44916() {
42	public void DISABLED_test44916() {
43		43
44	HSSFWorkbook wb = new HSSFWorkbook();	44	HSSFWorkbook wb = new HSSFWorkbook();
45	HSSFSheet sheet = wb.createSheet();	45	HSSFSheet sheet = wb.createSheet();

Return to bug 44916

Lines 73-78 Link Here

(-)src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (+6 lines)
73	* @author Yegor Kozlov (yegor at apache.org) (Autosizing columns)	73	* @author Yegor Kozlov (yegor at apache.org) (Autosizing columns)
74	* @author Josh Micich	74	* @author Josh Micich
75	* @author Petr Udalau(Petr.Udalau at exigenservices.com) - set/remove array formulas	75	* @author Petr Udalau(Petr.Udalau at exigenservices.com) - set/remove array formulas
		76	* @author Pierre Tholence (bug fix)
76	*/	77	*/
77	public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {	78	public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
78	private static final POILogger log = POILogFactory.getLogger(HSSFSheet.class);	79	private static final POILogger log = POILogFactory.getLogger(HSSFSheet.class);
Lines 95-100 Link Here
95	protected final HSSFWorkbook _workbook;	96	protected final HSSFWorkbook _workbook;
96	private int _firstrow;	97	private int _firstrow;
97	private int _lastrow;	98	private int _lastrow;
		99	private HSSFPatriarch _patriarch;
98		100
99	/**	101	/**
100	* Creates new HSSFSheet - called by HSSFWorkbook to create a sheet from	102	* Creates new HSSFSheet - called by HSSFWorkbook to create a sheet from
Lines 1578-1583 Link Here
1578	agg.clear(); // Initially the behaviour will be to clear out any existing shapes in the sheet when	1580	agg.clear(); // Initially the behaviour will be to clear out any existing shapes in the sheet when
1579	// creating a new patriarch.	1581	// creating a new patriarch.
1580	agg.setPatriarch(patriarch);	1582	agg.setPatriarch(patriarch);
		1583	_patriarch = patriarch;
1581	return patriarch;	1584	return patriarch;
1582	}	1585	}
1583		1586
Lines 1624-1629 Link Here
1624	* start from scratch!	1627	* start from scratch!
1625	*/	1628	*/
1626	public HSSFPatriarch getDrawingPatriarch() {	1629	public HSSFPatriarch getDrawingPatriarch() {
		1630	if(_patriarch != null) return _patriarch;
		1631
1627	EscherAggregate agg = getDrawingEscherAggregate();	1632	EscherAggregate agg = getDrawingEscherAggregate();
1628	if(agg == null) return null;	1633	if(agg == null) return null;
1629		1634
Lines 1635-1640 Link Here
1635	// that isn't supported, you were warned...)	1640	// that isn't supported, you were warned...)
1636	agg.convertRecordsToUserModel();	1641	agg.convertRecordsToUserModel();
1637		1642
		1643	_patriarch = patriarch;
1638	// Return what we could cope with	1644	// Return what we could cope with
1639	return patriarch;	1645	return patriarch;
1640	}	1646	}