diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /Plugins/PdfExport/pdfexport.cpp | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'Plugins/PdfExport/pdfexport.cpp')
| -rw-r--r-- | Plugins/PdfExport/pdfexport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Plugins/PdfExport/pdfexport.cpp b/Plugins/PdfExport/pdfexport.cpp index cd1ceca..38389a1 100644 --- a/Plugins/PdfExport/pdfexport.cpp +++ b/Plugins/PdfExport/pdfexport.cpp @@ -231,14 +231,14 @@ bool PdfExport::exportIndex(const QString& database, const QString& name, const exportObjectColumnsHeader(indexColumns); QString sort; - for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns) + for (SqliteOrderBy* idxCol : createIndex->indexedColumns) { - if (idxCol->sortOrder != SqliteSortOrder::null) - sort = sqliteSortOrder(idxCol->sortOrder); + if (idxCol->order != SqliteSortOrder::null) + sort = sqliteSortOrder(idxCol->order); else sort = ""; - exportObjectRow({idxCol->name, idxCol->collate, sort}); + exportObjectRow({idxCol->getColumnString(), idxCol->getCollation(), sort}); } if (createIndex->where) |