0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00

Redundant return will be removed from upper part of sliced text

This commit is contained in:
Arin Alexander 2016-05-17 22:59:41 +04:00
parent fc9e7c792b
commit fdc03900ea

View File

@ -415,6 +415,7 @@ BaseDesignIntf *TextItem::cloneUpperPart(int height, QObject *owner, QGraphicsIt
}
}
loop_exit:
tmpText = tmpText.trimmed();
upperPart->setHeight(linesHeight+fakeMarginSize()*2+borderLineSize()*2);
QScopedPointer<HtmlContext> context(new HtmlContext(m_strText));
upperPart->setContent(context->extendTextByTags(tmpText,0));
@ -446,6 +447,8 @@ BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsI
}
}
if (!m_strText.endsWith("\n")) tmpText = tmpText.trimmed();
QScopedPointer<HtmlContext> context(new HtmlContext(m_strText));
bottomPart->setContent(context->extendTextByTags(tmpText,textPos));
bottomPart->setHeight(bottomPart->m_textSize.height()+borderLineSize()*2);