Merge pull request #341 from hxbb00/master

fix: workbook.xml.rels with absolute path
QtExcel · Aug 8, 2024 · 9c70496 · 9c70496
2 parents f2594e0 + 3192b80
commit 9c70496
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/QXlsx/source/xlsxworkbook.cpp b/QXlsx/source/xlsxworkbook.cpp
@@ -607,15 +607,21 @@ bool Workbook::loadFromXmlFile(QIODevice *device)
 
                 AbstractSheet *sheet = addSheet(name, sheetId, type);
                 sheet->setSheetState(state);
-                QString strFilePath = filePath();
-
-                // const QString fullPath = QDir::cleanPath(splitPath(strFilePath).constFirst() +
-                // QLatin1String("/") + relationship.target);
-                const auto parts = splitPath(strFilePath);
-                QString fullPath =
-                    QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
-
-                sheet->setFilePath(fullPath);
+                if (relationship.target.startsWith("/")) {
+                    QString fullPath = QDir::cleanPath(relationship.target.mid(1));
+
+                    sheet->setFilePath(fullPath);
+                }else{                    
+                    QString strFilePath = filePath();
+
+                    // const QString fullPath = QDir::cleanPath(splitPath(strFilePath).constFirst() +
+                    // QLatin1String("/") + relationship.target);
+                    const auto parts = splitPath(strFilePath);
+                    QString fullPath =
+                        QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
+
+                    sheet->setFilePath(fullPath);
+                }
             } else if (reader.name() == QLatin1String("workbookPr")) {
                 QXmlStreamAttributes attrs = reader.attributes();
                 if (attrs.hasAttribute(QLatin1String("date1904")))