Imported Upstream version 3.0.4upstream/3.0.4

11 files changed, 14 insertions, 10 deletions

diff --git a/Plugins/XmlExport/XmlExport_de.ts b/Plugins/XmlExport/XmlExport_de.ts
index aa8eb2f..587f54c 100644
--- a/Plugins/XmlExport/XmlExport_de.ts
+++ b/Plugins/XmlExport/XmlExport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_es.ts b/Plugins/XmlExport/XmlExport_es.ts
index 532228c..c7c3fdf 100644
--- a/Plugins/XmlExport/XmlExport_es.ts
+++ b/Plugins/XmlExport/XmlExport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_fr.ts b/Plugins/XmlExport/XmlExport_fr.ts
index 80c2564..94e10d0 100644
--- a/Plugins/XmlExport/XmlExport_fr.ts
+++ b/Plugins/XmlExport/XmlExport_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_pl.ts b/Plugins/XmlExport/XmlExport_pl.ts
index fc0cfaa..8f2104e 100644
--- a/Plugins/XmlExport/XmlExport_pl.ts
+++ b/Plugins/XmlExport/XmlExport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_pt_BR.ts b/Plugins/XmlExport/XmlExport_pt_BR.ts
index 31a9cf7..f4faf44 100644
--- a/Plugins/XmlExport/XmlExport_pt_BR.ts
+++ b/Plugins/XmlExport/XmlExport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_ru.ts b/Plugins/XmlExport/XmlExport_ru.ts
index b7c76e6..28480fe 100644
--- a/Plugins/XmlExport/XmlExport_ru.ts
+++ b/Plugins/XmlExport/XmlExport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_sk.ts b/Plugins/XmlExport/XmlExport_sk.ts
index 5c674aa..07d694d 100644
--- a/Plugins/XmlExport/XmlExport_sk.ts
+++ b/Plugins/XmlExport/XmlExport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/XmlExport_zh_CN.ts b/Plugins/XmlExport/XmlExport_zh_CN.ts
index 162841d..34023fb 100644
--- a/Plugins/XmlExport/XmlExport_zh_CN.ts
+++ b/Plugins/XmlExport/XmlExport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>XmlExport</name>
     <message>
diff --git a/Plugins/XmlExport/xmlexport.cpp b/Plugins/XmlExport/xmlexport.cpp
index e76fe7d..0cea7df 100644
--- a/Plugins/XmlExport/xmlexport.cpp
+++ b/Plugins/XmlExport/xmlexport.cpp
@@ -103,6 +103,8 @@ bool XmlExport::exportQueryResultsRow(SqlResultsRowPtr row)
             writeln(nullTpl.arg(i));
         else
             writeln(rowTpl.arg(i).arg(escape(value.toString())));
+
+        i++;
     }
 
     decrIndent();
@@ -408,7 +410,7 @@ void XmlExport::writeln(const QString& str)
         QStringList lines = str.split("\n");
         QMutableStringListIterator it(lines);
         while (it.hasNext())
-            it.value().prepend(indentStr);
+            it.next().prepend(indentStr);
 
         newStr = lines.join("\n") + newLineStr;
     }
diff --git a/Plugins/XmlExport/xmlexport.json b/Plugins/XmlExport/xmlexport.json
index 2432cdd..5780e3e 100644
--- a/Plugins/XmlExport/xmlexport.json
+++ b/Plugins/XmlExport/xmlexport.json
@@ -2,6 +2,6 @@
     "type":        "ExportPlugin",
     "title":       "XML export",
     "description": "Provides XML format for exporting.",
-    "version":     10000,
+    "version":     10001,
     "author":      "SalSoft"
 }
diff --git a/Plugins/XmlExport/xmlexport.qrc b/Plugins/XmlExport/xmlexport.qrc
index d951458..554f642 100644
--- a/Plugins/XmlExport/xmlexport.qrc
+++ b/Plugins/XmlExport/xmlexport.qrc
@@ -6,5 +6,7 @@
         <file>XmlExport_pl.qm</file>
         <file>XmlExport_ru.qm</file>
         <file>XmlExport_fr.qm</file>
+        <file>XmlExport_sk.qm</file>
+        <file>XmlExport_zh_CN.qm</file>
     </qresource>
 </RCC>