Merge branch '1.4' into 1.4_ChartItem

Conflicts:
	limereport/items/items.qrc

limereport/items/items.qrc

@@ -1,15 +1,15 @@
 <RCC>
     <qresource prefix="/items">
         <file>images/insert-text.png</file>
-        <file alias="BarcodeItem">images/barcode2.png</file>
+        <file>images/barcode2.png</file>
         <file>images/imageItem.png</file>
         <file>images/shape2.png</file>
         <file>images/shape4.png</file>
         <file>images/insert-text_2.png</file>
         <file>images/insert-text_3.png</file>
         <file>images/hlayout.png</file>
-        <file alias="TextItem">images/insert-text_5.png</file>
-        <file alias="ShapeItem">images/shape5.png</file>
+        <file>images/insert-text_5.png</file>
+        <file>images/shape5.png</file>
         <file>images/imageItem1.png</file>
         <file alias="ImageItem">images/imageItem2.png</file>
         <file>images/settings.png</file>
@@ -33,6 +33,10 @@
         <file alias="GroupBandFooter">images/GroupFooter16.png</file>
         <file alias="GroupBandHeader">images/GroupHeader16.png</file>
         <file alias="PageItemDesignIntf">images/ReportPage16.png</file>
+        <file alias="TextItem">images/insert-text_6.png</file>
+        <file alias="BarcodeItem">images/barcode3.png</file>
+        <file alias="ShapeItem">images/shape6.png</file>
+        <file alias="ImageItem">images/imageItem3.png</file>
         <file alias="ChartItem">images/pie_chart2.png</file>
     </qresource>
 </RCC>

limereport/items/lrtextitem.cpp

@@ -655,11 +655,11 @@ BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsI
     loop_exit:;
 
     int textPos=0;
-    for (;curBlock!=m_text->end();curBlock=curBlock.next(),curLine=0){
+    for (;curBlock!=m_text->end() || curLine<curBlock.lineCount();curBlock=curBlock.next(), curLine=0, tmpText+='\n'){
         for (;curLine<curBlock.layout()->lineCount();curLine++){
             if (tmpText=="") textPos= 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());
         }
     }
     tmpText.chop(1);