kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]Fix mishandling of escaped html in Templates

Browse Source
This commit is contained in:
wandererfan
2019-09-17 07:23:48 -04:00
committed by WandererFan
parent 9fa56345cf
commit d76394cf59
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/TechDraw/Gui/TemplateTextField.cpp
View File

@@ -29,6 +29,8 @@
#include <QTextDocument>
#endif // #ifndef _PreCmp_
#include <Base/Console.h>
#include "DlgTemplateField.h"
#include "TemplateTextField.h"
@@ -64,11 +66,15 @@ void TemplateTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
ui.setFieldContent(tmplte->EditableTexts[fieldNameStr]);
if (ui.exec() == QDialog::Accepted) {
#if QT_VERSION >= 0x050000
QString qsClean = ui.getFieldContent().toHtmlEscaped();
#else
QString qsClean = Qt::escape( ui.getFieldContent() );
#endif
//WF: why is this escaped?
// "<" is converted elsewhere and no other characters cause problems.
// escaping causes "&" to appear as "&amp;" etc
//#if QT_VERSION >= 0x050000
// QString qsClean = ui.getFieldContent().toHtmlEscaped();
//#else
// QString qsClean = Qt::escape( ui.getFieldContent() );
//#endif
QString qsClean = ui.getFieldContent();
std::string utf8Content = qsClean.toUtf8().constData();
tmplte->EditableTexts.setValue(fieldNameStr, utf8Content);
}