diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index adc10d1118bb..2d08cb50c60e 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -2315,7 +2315,7 @@ QVariant PropertyStringListItem::value(const App::Property* prop) const QStringList list; const std::vector& value = ((App::PropertyStringList*)prop)->getValues(); for ( std::vector::const_iterator jt = value.begin(); jt != value.end(); ++jt ) { - list << QString::fromUtf8(jt->c_str()); + list << QString::fromUtf8(Base::Tools::escapedUnicodeToUtf8(*jt).c_str()); } return QVariant(list); diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index 5b1f560dae0d..ac9e42128497 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include "QDomNodeModel.h" #include "DrawUtil.h" @@ -102,7 +103,7 @@ void DrawViewSymbol::onChanged(const App::Property* prop) while (!queryResult.next().isNull()) { QDomElement tspanElement = model.toDomNode(queryResult.current().toNodeModelIndex()).toElement(); - editables.push_back(tspanElement.text().toStdString()); + editables.push_back(Base::Tools::escapedUnicodeFromUtf8(tspanElement.text().toStdString().c_str())); } } else { @@ -162,7 +163,8 @@ App::DocumentObjectExecReturn *DrawViewSymbol::execute(void) } // Finally append text node with editable replacement as the only descendant - tspanElement.appendChild(symbolDocument.createTextNode(QString::fromUtf8(editText[count].c_str()))); + tspanElement.appendChild(symbolDocument.createTextNode( + QString::fromUtf8(Base::Tools::escapedUnicodeToUtf8(editText[count]).c_str()))); ++count; } diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index fdd395b2b95a..0e8572f3057c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "Rez.h" @@ -151,11 +152,10 @@ void QGIViewAnnotation::drawAnnotation() ss << "color:" << c.asCSSString() << "; "; ss << "}\n\n\n\n

"; for(std::vector::const_iterator it = annoText.begin(); it != annoText.end(); it++) { - if (it == annoText.begin()) { - ss << *it; - } else { - ss << "
" << *it ; + if (it != annoText.begin()) { + ss << "
"; } + ss << Base::Tools::escapedUnicodeToUtf8(*it); } ss << "

\n\n ";