mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-07-10 21:53:46 +03:00
Code

minor fixes

Browse Source
This commit is contained in:
Kozlov Vladimir 2025-06-04 14:37:42 +03:00
parent c7e4028637
commit cb6a6f19af
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/items/lrtextitem.cpp
View File

@ -367,13 +367,13 @@ bool TextItem::isNeedExpandContent() const
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1)) #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx("$*\\{[^{]*\\}"); QRegExp rx("$*\\{[^{]*\\}");
return content().contains(rx) || isContentBackedUp();
#else #else
bool result = false; bool result = false;
QRegularExpression rx("\\$*\\{[^{]*\\}"); QRegularExpression rx("\\$*\\{[^{]*\\}");
result = content().contains(rx) || isContentBackedUp(); result = content().contains(rx) || isContentBackedUp();
return result; return result;
#endif #endif
return content().contains(rx) || isContentBackedUp();
} }
QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); } QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); }

1
limereport/lrdatasourcemanager.cpp
View File

@ -489,7 +489,6 @@ QString DataSourceManager::replaceVariables(QString value)
} }
return value; return value;
#endif #endif
return QString();
} }
QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam) QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam)