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

(-)Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java (-4 / +6 lines)
Lines 205-210 Link Here
205
		int pageWidth;									// width of a printer page in pixels
205
		int pageWidth;									// width of a printer page in pixels
206
		int startPage;									// first page to print
206
		int startPage;									// first page to print
207
		int endPage;									// last page to print
207
		int endPage;									// last page to print
208
		int scope;										// scope of print job
208
		int startLine;									// first (wrapped) line to print
209
		int startLine;									// first (wrapped) line to print
209
		int endLine;									// last (wrapped) line to print
210
		int endLine;									// last (wrapped) line to print
210
		boolean singleLine;								// widget single line mode
211
		boolean singleLine;								// widget single line mode
Lines 230-236 Link Here
230
		startPage = 1;
231
		startPage = 1;
231
		endPage = Integer.MAX_VALUE;
232
		endPage = Integer.MAX_VALUE;
232
		PrinterData data = printer.getPrinterData();
233
		PrinterData data = printer.getPrinterData();
233
		if (data.scope == PrinterData.PAGE_RANGE) {
234
		scope = data.scope;
235
		if (scope == PrinterData.PAGE_RANGE) {
234
			startPage = data.startPage;
236
			startPage = data.startPage;
235
			endPage = data.endPage;
237
			endPage = data.endPage;
236
			if (endPage < startPage) {
238
			if (endPage < startPage) {
Lines 238-244 Link Here
238
				endPage = startPage;
240
				endPage = startPage;
239
				startPage = temp;
241
				startPage = temp;
240
			}
242
			}
241
		} else if (data.scope == PrinterData.SELECTION) {
243
		} else if (scope == PrinterData.SELECTION) {
242
			selection = styledText.getSelectionRange();
244
			selection = styledText.getSelectionRange();
243
		}
245
		}
244
		printerRenderer = new StyledTextRenderer(printer, null);
246
		printerRenderer = new StyledTextRenderer(printer, null);
Lines 438-447 Link Here
438
		startLine = 0;
440
		startLine = 0;
439
		endLine = singleLine ? 0 : content.getLineCount() - 1;
441
		endLine = singleLine ? 0 : content.getLineCount() - 1;
440
		PrinterData data = printer.getPrinterData();
442
		PrinterData data = printer.getPrinterData();
441
		if (data.scope == PrinterData.PAGE_RANGE) {
443
		if (scope == PrinterData.PAGE_RANGE) {
442
			int pageSize = clientArea.height / lineHeight;//WRONG
444
			int pageSize = clientArea.height / lineHeight;//WRONG
443
			startLine = (startPage - 1) * pageSize;
445
			startLine = (startPage - 1) * pageSize;
444
		} else if (data.scope == PrinterData.SELECTION) {
446
		} else if (scope == PrinterData.SELECTION) {
445
			startLine = content.getLineAtOffset(selection.x);
447
			startLine = content.getLineAtOffset(selection.x);
446
			if (selection.y > 0) {
448
			if (selection.y > 0) {
447
				endLine = content.getLineAtOffset(selection.x + selection.y - 1);
449
				endLine = content.getLineAtOffset(selection.x + selection.y - 1);

Return to bug 297957