From fc68dadb04c234452407397ff43c5a083dbbda9b Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 4 Apr 2019 18:53:29 +0300 Subject: [PATCH] Group functions have been fixed --- limereport/lrreportrender.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index e0bc4e1..10a00be 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -335,7 +335,9 @@ void ReportRender::extractGroupFuntionsFromItem(ContentItemDesignIntf* contentIt if ( contentItem && contentItem->content().contains(QRegExp("\\$S\\s*\\{.*\\}"))){ foreach(const QString &functionName, m_datasources->groupFunctionNames()){ QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName)); + rx.setMinimal(true); QRegExp rxName(QString(Const::GROUP_FUNCTION_NAME_RX).arg(functionName)); + rxName.setMinimal(true); if (rx.indexIn(contentItem->content())>=0){ int pos = 0; while ( (pos = rx.indexIn(contentItem->content(),pos)) != -1){ @@ -382,6 +384,7 @@ void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentIte QString content = contentItem->content(); foreach(const QString &functionName, m_datasources->groupFunctionNames()){ QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName)); + rx.setMinimal(true); if (rx.indexIn(content)>=0){ int pos = 0; while ( (pos = rx.indexIn(content,pos))!= -1 ){