Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-10-12 00:54:09 +04:00
commit 6e74cd266f

View File

@ -642,8 +642,8 @@ BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsI
loop_exit:; loop_exit:;
int textPos=0; int textPos=0;
for (;curBlock!=m_text->end();curBlock=curBlock.next()){ for (;curBlock!=m_text->end();curBlock=curBlock.next(),curLine=0){
for (curLine=0;curLine<curBlock.layout()->lineCount();curLine++){ for (;curLine<curBlock.layout()->lineCount();curLine++){
if (tmpText=="") textPos= curBlock.layout()->lineAt(curLine).textStart(); if (tmpText=="") textPos= curBlock.layout()->lineAt(curLine).textStart();
tmpText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(), tmpText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(),
curBlock.layout()->lineAt(curLine).textLength()) + "\n"; curBlock.layout()->lineAt(curLine).textLength()) + "\n";