fix text document path for tables (#451)

Author: andiwand

cli/src/server.cpp

@@ -21,7 +21,6 @@ int main(const int argc, char **argv) {
   DecodePreference decode_preference;
   decode_preference.engine_priority = {
       DecoderEngine::poppler, DecoderEngine::wvware, DecoderEngine::odr};
-  decode_preference.as_file_type = FileType::zip;
 
   DecodedFile decoded_file{input, decode_preference, *logger};
 

src/odr/document_path.cpp

@@ -116,10 +116,10 @@ Element DocumentPath::find(const Element root, const DocumentPath &path) {
       element = element.first_child();
       number = child->number;
     } else if (const auto column = std::get_if<Column>(&c)) {
-      if (!element.as_table().first_column()) {
+      if (!element.as_table_row()) {
         throw std::invalid_argument("column not found");
       }
-      element = Element(element.as_table().first_column());
+      element = element.as_table_row().first_child();
       number = column->number;
     } else if (const auto row = std::get_if<Row>(&c)) {
       if (!element.as_table().first_row()) {

test/src/document_test.cpp

@@ -57,6 +57,26 @@ TEST(Document, odt_element_path) {
   EXPECT_EQ(t1_via_path, t1);
 }
 
+TEST(Document, odt_element_path2) {
+  const auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
+  const DocumentFile document_file(
+      TestData::test_file_path("odr-public/odt/style-various-1.odt"), *logger);
+
+  EXPECT_EQ(document_file.file_type(), FileType::opendocument_text);
+
+  const Document document = document_file.document();
+
+  EXPECT_EQ(document.document_type(), DocumentType::text);
+
+  const auto root = document.root_element();
+
+  const Element cell_via_path = DocumentPath::find(
+      root, DocumentPath("/child:41/row:0/column:1/child:0/child:0"));
+  EXPECT_EQ(cell_via_path.type(), ElementType::text);
+  EXPECT_EQ(cell_via_path.as_text().content(), "B1");
+}
+
 TEST(Document, odg) {
   auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);