Don't add empty line to text output

stweil · stweil · commit 8bb5a89d5ac0 · 2017-08-21T09:47:35.000+02:00
Empty lines in text output are needed to separate paragraphs,
but there should not be an empty line at the end of the text.

Signed-off-by: Stefan Weil &lt;sw@weilnetz.de&gt;
diff --git a/ccmain/resultiterator.cpp b/ccmain/resultiterator.cpp
@@ -658,8 +658,9 @@ void ResultIterator::IterateAndAppendUTF8TextlineText(STRING *text) {
   }
   *text += line_separator_;
   // If we just finished a paragraph, add an extra newline.
-  if (it_->block() == NULL || IsAtBeginningOf(RIL_PARA))
+  if (IsAtBeginningOf(RIL_PARA)) {
     *text += paragraph_separator_;
+  }
 }
 
 void ResultIterator::AppendUTF8ParagraphText(STRING *text) const {

Original file line number	Diff line number	Diff line change
`@@ -658,8 +658,9 @@ void ResultIterator::IterateAndAppendUTF8TextlineText(STRING *text) {`
`658`	`658`	`}`
`659`	`659`	`*text += line_separator_;`
`660`	`660`	`// If we just finished a paragraph, add an extra newline.`
`661`		`- if (it_->block() == NULL \|\| IsAtBeginningOf(RIL_PARA))`
	`661`	`+ if (IsAtBeginningOf(RIL_PARA)) {`
`662`	`662`	`*text += paragraph_separator_;`
	`663`	`+ }`
`663`	`664`	`}`
`664`	`665`
`665`	`666`	`void ResultIterator::AppendUTF8ParagraphText(STRING *text) const {`