Attachment #34334 for bug #60219

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




            return sb.toString();
        }
    }
    
    private String getBookName() {
        StringBuilder sb = new StringBuilder();
        GetChar();
        while (look != ']') {
            sb.append(look);
            GetChar();
        }
        GetChar();
        return sb.toString();
    }

    /**
     * Note - caller should reset {@link #_pointer} upon <code>null</code> result

    private SheetIdentifier parseSheetName() {
        String bookName;
        if (look == '[') {
        	bookName = getBookName();
            GetChar();
            while (look != ']') {
                sb.append(look);
                GetChar();
            }
            GetChar();
            bookName = sb.toString();
        } else {
            bookName = null;
        }

        if (look == '\'') {
            Match('\'');
            
            if (look == '[')
            	bookName = getBookName();
            
            StringBuffer sb = new StringBuffer();

            Match('\'');
            boolean done = look == '\'';
            while(!done) {
                sb.append(look);

Return to bug 60219

Lines 1119-1124 Link Here

(-)src/java/org/apache/poi/ss/formula/FormulaParser.java (-10 / +17 lines)
1119	return sb.toString();	1119	return sb.toString();
1120	}	1120	}
1121	}	1121	}
		1122
		1123	private String getBookName() {
		1124	StringBuilder sb = new StringBuilder();
		1125	GetChar();
		1126	while (look != ']') {
		1127	sb.append(look);
		1128	GetChar();
		1129	}
		1130	GetChar();
		1131	return sb.toString();
		1132	}
1122		1133
1123	/**	1134	/**
1124	* Note - caller should reset {@link #_pointer} upon <code>null</code> result	1135	* Note - caller should reset {@link #_pointer} upon <code>null</code> result
Lines 1127-1148 Link Here
1127	private SheetIdentifier parseSheetName() {	1138	private SheetIdentifier parseSheetName() {
1128	String bookName;	1139	String bookName;
1129	if (look == '[') {	1140	if (look == '[') {
1130	StringBuilder sb = new StringBuilder();	1141	bookName = getBookName();
1131	GetChar();
1132	while (look != ']') {
1133	sb.append(look);
1134	GetChar();
1135	}
1136	GetChar();
1137	bookName = sb.toString();
1138	} else {	1142	} else {
1139	bookName = null;	1143	bookName = null;
1140	}	1144	}
1141		1145
1142	if (look == '\'') {	1146	if (look == '\'') {
		1147	Match('\'');
		1148
		1149	if (look == '[')
		1150	bookName = getBookName();
		1151
1143	StringBuffer sb = new StringBuffer();	1152	StringBuffer sb = new StringBuffer();
1144
1145	Match('\'');
1146	boolean done = look == '\'';	1153	boolean done = look == '\'';
1147	while(!done) {	1154	while(!done) {
1148	sb.append(look);	1155	sb.append(look);