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

(-)src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java (-3 / +6 lines)
Lines 170-176 Link Here
170
            Sheet sheet = parentRun.getSheet();
170
            Sheet sheet = parentRun.getSheet();
171
            int txtype = parentRun.getRunType();
171
            int txtype = parentRun.getRunType();
172
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
172
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
173
            cftp = (CharFlagsTextProp)master.getStyleAttribute(txtype, getIndentLevel(), "char_flags", true);
173
            if (master != null)
174
                cftp = (CharFlagsTextProp)master.getStyleAttribute(txtype, getIndentLevel(), "char_flags", true);
174
        }
175
        }
175
176
176
		return cftp == null ? false : cftp.getSubValue(index);
177
		return cftp == null ? false : cftp.getSubValue(index);
Lines 223-229 Link Here
223
            Sheet sheet = parentRun.getSheet();
224
            Sheet sheet = parentRun.getSheet();
224
            int txtype = parentRun.getRunType();
225
            int txtype = parentRun.getRunType();
225
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
226
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
226
            prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, true);
227
            if (master != null)
228
                prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, true);
227
        }
229
        }
228
		return prop == null ? -1 : prop.getValue();
230
		return prop == null ? -1 : prop.getValue();
229
	}
231
	}
Lines 242-248 Link Here
242
            Sheet sheet = parentRun.getSheet();
244
            Sheet sheet = parentRun.getSheet();
243
            int txtype = parentRun.getRunType();
245
            int txtype = parentRun.getRunType();
244
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
246
            SlideMaster master = (SlideMaster)sheet.getMasterSheet();
245
            prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, false);
247
            if (master != null)
248
                prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, false);
246
        }
249
        }
247
250
248
		return prop == null ? -1 : prop.getValue();
251
		return prop == null ? -1 : prop.getValue();
(-)src/scratchpad/src/org/apache/poi/hslf/model/Notes.java (+4 lines)
Lines 56-61 Link Here
56
	//  one of TextBytesAtom or TextCharsAtom, found inside 
56
	//  one of TextBytesAtom or TextCharsAtom, found inside 
57
	//  EscherTextboxWrapper's in the PPDrawing
57
	//  EscherTextboxWrapper's in the PPDrawing
58
	_runs = findTextRuns(_notes.getPPDrawing());
58
	_runs = findTextRuns(_notes.getPPDrawing());
59
60
	// Set the sheet on each TextRun
61
	for (int i = 0; i < _runs.length; i++)
62
		_runs[i].setSheet(this);
59
  }
63
  }
60
64
61
65

Return to bug 42474