summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets
diff options
context:
space:
mode:
authorMarkus Keller <markus_keller@ch.ibm.com>2012-10-18 20:14:24 +0200
committerMarkus Keller <markus_keller@ch.ibm.com>2012-10-18 20:14:24 +0200
commitb4dfa25ce1ddde6037308a5f9e2105a81151f900 (patch)
tree40bdb9ad79ea9b04a4ef6eb01d39523a6a8a7bd4 /bundles/org.eclipse.swt/Eclipse SWT Custom Widgets
parent356366c757fd1bf4314a6b8a0628110e3b25e6d3 (diff)
downloadeclipse.platform.swt-b4dfa25ce1ddde6037308a5f9e2105a81151f900.tar.gz
eclipse.platform.swt-b4dfa25ce1ddde6037308a5f9e2105a81151f900.tar.xz
eclipse.platform.swt-b4dfa25ce1ddde6037308a5f9e2105a81151f900.zip
Bug 391364: StyledText#addBidiSegmentListener doesn't support multiple chars per offset any more
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Custom Widgets')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index 041e97386c..408c869a43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -4779,8 +4779,9 @@ StyledTextEvent getBidiSegments(int lineOffset, String line) {
if (segments[0] > lineLength) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
+ boolean hasSegmentsChars = event.segmentsChars != null;
for (int i = 1; i < segments.length; i++) {
- if (segments[i] <= segments[i - 1] || segments[i] > lineLength) {
+ if ((hasSegmentsChars ? segments[i] < segments[i - 1] : segments[i] <= segments[i - 1]) || segments[i] > lineLength) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}