Attachment #20778 for bug #43323

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




    * @param idx the index of the picture
     */
    public Picture(int idx){
        this(idx, null);
        _escherContainer = createSpContainer(idx);
    }

    public Picture(int idx, Shape parent) {
        super(null, parent);
        _escherContainer = createSpContainer(idx, parent instanceof ShapeGroup);
    }

    /**
      * Create a <code>Picture</code> object
      *

     * @param idx the index of the picture which referes to <code>EscherBSE</code> container.
     * @return the create Picture object
     */
    protected EscherContainerRecord createSpContainer(int idx, boolean isChild) {
        EscherContainerRecord spContainer = super.createSpContainer(isChild);
        spContainer.setOptions((short)15);

        EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);

Return to bug 43323

Lines 75-84 Link Here

(-)src/scratchpad/src/org/apache/poi/hslf/model/Picture.java (-4 / +8 lines)
75	* @param idx the index of the picture	75	* @param idx the index of the picture
76	*/	76	*/
77	public Picture(int idx){	77	public Picture(int idx){
78	super(null, null);	78	this(idx, null);
79	_escherContainer = createSpContainer(idx);
80	}	79	}
81		80
		81	public Picture(int idx, Shape parent) {
		82	super(null, parent);
		83	_escherContainer = createSpContainer(idx, parent instanceof ShapeGroup);
		84	}
		85
82	/**	86	/**
83	* Create a <code>Picture</code> object	87	* Create a <code>Picture</code> object
84	*	88	*
Lines 109-116 Link Here
109	* @param idx the index of the picture which referes to <code>EscherBSE</code> container.	113	* @param idx the index of the picture which referes to <code>EscherBSE</code> container.
110	* @return the create Picture object	114	* @return the create Picture object
111	*/	115	*/
112	protected EscherContainerRecord createSpContainer(int idx) {	116	protected EscherContainerRecord createSpContainer(int idx, boolean isChild) {
113	EscherContainerRecord spContainer = super.createSpContainer(false);	117	EscherContainerRecord spContainer = super.createSpContainer(isChild);
114	spContainer.setOptions((short)15);	118	spContainer.setOptions((short)15);
115		119
116	EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);	120	EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);