diff --git a/libs/main/tests/documentstructuretest.cpp b/libs/main/tests/documentstructuretest.cpp --- a/libs/main/tests/documentstructuretest.cpp +++ b/libs/main/tests/documentstructuretest.cpp @@ -102,7 +102,7 @@ KoDocumentInfo *documentInfo = loadDocumentInfo(odt); QVERIFY(documentInfo); QString keyword = documentInfo->aboutInfo("keyword"); - QStringList keywords = keyword.split(", "); + QStringList keywords = keyword.split(";"); QVERIFY(keywords.count() == 3); QCOMPARE(keywords[0], QString("First keyword")); QCOMPARE(keywords[1], QString("Second keyword")); diff --git a/libs/odf/KoDocumentInfo.h b/libs/odf/KoDocumentInfo.h --- a/libs/odf/KoDocumentInfo.h +++ b/libs/odf/KoDocumentInfo.h @@ -220,6 +220,7 @@ QMap m_aboutInfo; /** The original meta:generator of the document */ QString m_generator; + const QString m_keywordSeparator = QStringLiteral(";"); Q_SIGNALS: void infoUpdated(const QString &info, const QString &data); diff --git a/libs/odf/KoDocumentInfo.cpp b/libs/odf/KoDocumentInfo.cpp --- a/libs/odf/KoDocumentInfo.cpp +++ b/libs/odf/KoDocumentInfo.cpp @@ -266,7 +266,7 @@ foreach(const QString &tag, m_aboutTags) { if (!aboutInfo(tag).isEmpty() || tag == "title") { if (tag == "keyword") { - foreach(const QString & tmp, aboutInfo("keyword").split(';')) { + foreach(const QString & tmp, aboutInfo("keyword").split(m_keywordSeparator)) { xmlWriter.startElement("meta:keyword"); xmlWriter.addTextNode(tmp); xmlWriter.endElement(); @@ -328,7 +328,7 @@ } if (keywords.count() > 0) { - setAboutInfo("keyword", keywords.join(", ")); + setAboutInfo("keyword", keywords.join(m_keywordSeparator)); } return true;