Add initializeColumnTypes method to ImportOds class and refactor getColumnTypes.

Author: przemek83

include/eible/ImportOds.h

@@ -77,6 +77,8 @@ class EIBLE_EXPORT ImportOds : public ImportSpreadsheet
 
     bool isSheetAvailable(const QString& sheetName);
 
+    bool initializeColumnTypes(const QString& sheetName);
+
     std::optional<QStringList> sheetNames_{std::nullopt};
 
     const QString TABLE_TAG{QStringLiteral("table")};

src/ImportOds.cpp

@@ -33,18 +33,7 @@ std::pair<bool, QVector<ColumnType>> ImportOds::getColumnTypes(
         it != columnTypes_.constEnd())
         return {true, *it};
 
-    if (!isSheetAvailable(sheetName))
-        return {false, {}};
-
-    QuaZipFile quaZipFile;
-    if (!initZipFile(quaZipFile, QStringLiteral("content.xml")))
-        return {false, {}};
-
-    if (QXmlStreamReader reader;
-        !moveToSecondRow(sheetName, quaZipFile, reader))
-        return {false, {}};
-
-    if (!analyzeSheet(sheetName))
+    if (!isSheetAvailable(sheetName) || !initializeColumnTypes(sheetName))
         return {false, {}};
 
     return {true, columnTypes_.value(sheetName)};
@@ -473,3 +462,16 @@ bool ImportOds::isSheetAvailable(const QString& sheetName)
 
     return isSheetNameValid(*sheetNames_, sheetName);
 }
+
+bool ImportOds::initializeColumnTypes(const QString& sheetName)
+{
+    QuaZipFile quaZipFile;
+    if (!initZipFile(quaZipFile, QStringLiteral("content.xml")))
+        return false;
+
+    if (QXmlStreamReader reader;
+        !moveToSecondRow(sheetName, quaZipFile, reader))
+        return false;
+
+    return analyzeSheet(sheetName);
+}