Fix java.lang.StringIndexOutOfBoundsException in TextArea.calculateTe…

…xt when whiteSpace:nowrap is used
hvbtup · Jun 23, 2021 · be6294f · be6294f
1 parent 9035efe
commit be6294f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/...rt.report.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/TextCompositor.java b/...rt.report.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/TextCompositor.java
@@ -335,16 +335,18 @@ private void addWordIntoTextArea( TextArea textArea, Word word )
 				wordVestige = null;
 				insertFirstExceedWord = false;
 			}
-			if ( isNewLine && context.isEnableWordbreak( ))
+			if ( isNewLine && textArea.isEmpty( ) )
 			{
-				doWordBreak( word.getValue( ), textArea );
-			}
-			else if ( isNewLine && textArea.isEmpty( ) )
-			{
-				// If width of a word is larger than the max line width, add
-				// it into the line directly.
-				addWord( textArea, textLength, wordWidth );
-
+				if ( context.isEnableWordbreak( ) )
+				{
+					doWordBreak( word.getValue( ), textArea );
+				}
+				else
+				{
+					// If width of a word is larger than the max line width, add
+					// it into the line directly.
+					addWord( textArea, textLength, wordWidth );
+				}
 			}
 			else
 			{