Attachment #33086 for bug #58350

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




     * faster than calling {@link #getMergedRegion(int)} each time.
     *
     * @return the list of merged regions
     * @throws IllegalStateException if this worksheet does not contain merged regions
     */
    @SuppressWarnings("deprecation")
    @Override
    public List<CellRangeAddress> getMergedRegions() {
        List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
        CTMergeCells ctMergeCells = worksheet.getMergeCells();
        if(ctMergeCells == null) return addresses;

        List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
        for(CTMergeCell ctMergeCell : ctMergeCells.getMergeCellArray()) {
            String ref = ctMergeCell.getRef();
            addresses.add(CellRangeAddress.valueOf(ref));

Return to bug 58350

Lines 1104-1118 Link Here

(-)src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (-3 / +2 lines)
1104	* faster than calling {@link #getMergedRegion(int)} each time.	1104	* faster than calling {@link #getMergedRegion(int)} each time.
1105	*	1105	*
1106	* @return the list of merged regions	1106	* @return the list of merged regions
1107	* @throws IllegalStateException if this worksheet does not contain merged regions
1108	*/	1107	*/
1109	@SuppressWarnings("deprecation")	1108	@SuppressWarnings("deprecation")
1110	@Override	1109	@Override
1111	public List<CellRangeAddress> getMergedRegions() {	1110	public List<CellRangeAddress> getMergedRegions() {
		1111	List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
1112	CTMergeCells ctMergeCells = worksheet.getMergeCells();	1112	CTMergeCells ctMergeCells = worksheet.getMergeCells();
1113	if(ctMergeCells == null) throw new IllegalStateException("This worksheet does not contain merged regions");	1113	if(ctMergeCells == null) return addresses;
1114		1114
1115	List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
1116	for(CTMergeCell ctMergeCell : ctMergeCells.getMergeCellArray()) {	1115	for(CTMergeCell ctMergeCell : ctMergeCells.getMergeCellArray()) {
1117	String ref = ctMergeCell.getRef();	1116	String ref = ctMergeCell.getRef();
1118	addresses.add(CellRangeAddress.valueOf(ref));	1117	addresses.add(CellRangeAddress.valueOf(ref));