# HG changeset patch # User Chris Cannam # Date 1412346422 -3600 # Node ID d854c72dcaa1f2b4ad2098e0e0ee18e605fed6c4 # Parent de9472751d315333c064a9128a35334009b21641 Handle variable columns by importing all of them (not just the minimum number) diff -r de9472751d31 -r d854c72dcaa1 widgets/CSVFormatDialog.cpp --- a/widgets/CSVFormatDialog.cpp Fri Oct 03 15:09:27 2014 +0100 +++ b/widgets/CSVFormatDialog.cpp Fri Oct 03 15:27:02 2014 +0100 @@ -99,6 +99,9 @@ cpc->setCurrentIndex(int(m_format.getColumnPurpose(i))); for (int j = 0; j < example.size() && j < 6; ++j) { + if (i >= example[j].size()) { + continue; + } QLabel *label = new QLabel; label->setTextFormat(Qt::PlainText); QString text = TextAbbrev::abbreviate(example[j][i], 35);