bugzilla 52682 - allow setting text with trailing carriage return in HSLF

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1295488 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2012-03-01 09:51:28 +00:00
parent cee330b145
commit ede267e7a9
3 changed files with 3 additions and 8 deletions

View File

@ -34,6 +34,7 @@
<changes>
<release version="3.8-beta6" date="2012-??-??">
<action dev="poi-developers" type="fix">52682 - allow setting text with trailing carriage return in HSLF</action>
<action dev="poi-developers" type="fix">52244 - use correct text attributes when presentation has multiple TxMasterStyleAtoms of the same type</action>
<action dev="poi-developers" type="add">support setting background color of sheet tab in XSSF</action>
<action dev="poi-developers" type="add">51564 - support for enforcing fields update in XWPF</action>

View File

@ -320,12 +320,6 @@ public final class TextRun
* touch the stylings.
*/
private void storeText(String s) {
// Remove a single trailing \r, as there is an implicit one at the
// end of every record
if(s.endsWith("\r")) {
s = s.substring(0, s.length()-1);
}
// Store in the appropriate record
if(_isUnicode) {
// The atom can safely convert to unicode

View File

@ -100,9 +100,9 @@ public final class TestTextRun extends TestCase {
run.setText(changeTo);
assertEquals(changeTo, run.getText());
// Ensure trailing \n's get stripped
// Ensure trailing \n's are NOT stripped, it is legal to set a text with a trailing '\r'
run.setText(changeTo + "\n");
assertEquals(changeTo, run.getText());
assertEquals(changeTo + "\n", run.getText());
}
/**