Refactor getColumnNames method to improve sheet availability checks a…

…nd return logic.
przemek83 · Jan 2, 2025 · 2535614 · 2535614
1 parent da5ee19
commit 2535614
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/ImportOds.cpp b/src/ImportOds.cpp
@@ -41,14 +41,14 @@ std::pair<bool, QVector<ColumnType>> ImportOds::getColumnTypes(
 
 std::pair<bool, QStringList> 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<bool, QVector<QVector<QVariant>>> ImportOds::getLimitedData(