diff --git a/src/ImportOds.cpp b/src/ImportOds.cpp index 91b4a1b..f968e99 100644 --- a/src/ImportOds.cpp +++ b/src/ImportOds.cpp @@ -41,14 +41,14 @@ std::pair> ImportOds::getColumnTypes( std::pair ImportOds::getColumnNames(const QString& sheetName) { - if (!isSheetAvailable(sheetName)) - return {false, {}}; - if (const auto it{columnNames_.constFind(sheetName)}; - (it == columnNames_.constEnd()) && (!analyzeSheet(sheetName))) - return {false, {}}; + it != columnNames_.constEnd()) + return {true, *it}; + + if (isSheetAvailable(sheetName) && analyzeSheet(sheetName)) + return {true, columnNames_.value(sheetName)}; - return {true, columnNames_.value(sheetName)}; + return {false, {}}; } std::pair>> ImportOds::getLimitedData(