mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Merge tag '1.5.75' into develop

Browse Source 
Finish 1.5.75
This commit is contained in:
Arin Alexander 2020-12-25 23:03:11 +03:00
commit 1694441453
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
limereport/items/lrverticallayout.cpp
View File

@ -116,20 +116,14 @@ BaseDesignIntf* VerticalLayout::cloneBottomPart(int height, QObject* owner, QGra
bottomPart->initFromItem(this); bottomPart->initFromItem(this);
foreach(BaseDesignIntf* item,childBaseItems()){ foreach(BaseDesignIntf* item,childBaseItems()){
if ((item->geometry().top() < height) && ( item->geometry().bottom() > height )){ if (item->geometry().bottom() > height){
int sliceHeight = height - item->geometry().top(); int sliceHeight = height - item->geometry().top();
if (item->canBeSplitted(sliceHeight)){ if ((item->geometry().top() < height) && (item->canBeSplitted(sliceHeight))){
BaseDesignIntf* tmpItem = item->cloneBottomPart(sliceHeight, bottomPart, bottomPart); BaseDesignIntf* tmpItem = item->cloneBottomPart(sliceHeight, bottomPart, bottomPart);
tmpItem->setPos(tmpItem->pos().x(),0);
tmpItem->setHeight(sliceHeight); tmpItem->setHeight(sliceHeight);
bottomPart->addChild(tmpItem);
} else { } else {
item->cloneItem(item->itemMode(), bottomPart, bottomPart); bottomPart->addChild(item->cloneItem(item->itemMode(), bottomPart, bottomPart));
item->setPos(item->pos().x(), 0);
}
} else {
if (item->geometry().top() >= height){
BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(), bottomPart, bottomPart);
tmpItem->setPos(item->pos().x(), item->pos().y() - height);
} }
} }
} }

6
limereport/lrsimplecrypt.cpp
View File

@ -29,6 +29,8 @@
****************************************************************************/ ****************************************************************************/
#include "lrsimplecrypt.h" #include "lrsimplecrypt.h"
namespace LimeReport {
#if defined(LP64) || defined(_LP64) || defined(__LP64__) #if defined(LP64) || defined(_LP64) || defined(__LP64__)
typedef unsigned int WORD; /* Should be 32-bit = 4 bytes */ typedef unsigned int WORD; /* Should be 32-bit = 4 bytes */
#else #else
@ -62,8 +64,6 @@ void initPt(WTB& pt, QByteArray::Iterator* it, QByteArray::Iterator end){
} }
} }
namespace LimeReport {
class ChipperPrivate{ class ChipperPrivate{
friend class Chipper; friend class Chipper;
public: public:
@ -117,7 +117,7 @@ QByteArray Chipper::cryptString(QString value)
{ {
QByteArray buff; QByteArray buff;
QByteArray result; QByteArray result;
buff += value; buff += value.toUtf8();
WTB pt, ct, prior; WTB pt, ct, prior;
if (!d->isPrepared()) if (!d->isPrepared())