fix images

Author: andiwand

src/odr/internal/odf/odf_element.cpp

@@ -441,7 +441,11 @@ bool Image::is_internal(const abstract::Document *document) const {
     return false;
   }
   try {
-    return doc->as_filesystem()->is_file(common::Path(href(document)));
+    common::Path path(href(document));
+    if (path.relative()) {
+      path = common::Path("/").join(path);
+    }
+    return doc->as_filesystem()->is_file(path);
   } catch (...) {
   }
   return false;
@@ -452,7 +456,11 @@ std::optional<odr::File> Image::file(const abstract::Document *document) const {
   if (!doc || !is_internal(document)) {
     return {};
   }
-  return File(doc->as_filesystem()->open(common::Path(href(document))));
+  common::Path path(href(document));
+  if (path.relative()) {
+    path = common::Path("/").join(path);
+  }
+  return File(doc->as_filesystem()->open(path));
 }
 
 std::string Image::href(const abstract::Document *) const {

src/odr/internal/ooxml/text/ooxml_text_element.cpp

@@ -8,7 +8,6 @@
 #include <odr/internal/ooxml/text/ooxml_text_document.hpp>
 #include <odr/internal/util/xml_util.hpp>
 
-#include <functional>
 #include <optional>
 
 #include <pugixml.hpp>
@@ -285,7 +284,11 @@ std::optional<odr::File> Image::file(const abstract::Document *document) const {
   if (!doc || !is_internal(document)) {
     return {};
   }
-  return File(doc->as_filesystem()->open(common::Path(href(document))));
+  common::Path path(href(document));
+  if (path.relative()) {
+    path = common::Path("/").join(path);
+  }
+  return File(doc->as_filesystem()->open(path));
 }
 
 std::string Image::href(const abstract::Document *document) const {