okular: adjust xps generator to KArchive behaviour

trying to generate entry paths (absolute or otherwise) is the wrong thing
to do, they should be checked if they are in the archive instead (with or
without leading slash)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/okular/generators/xps/generator_xps.cpp b/okular/generators/xps/generator_xps.cpp
index 19195b9..df5a485 100644 (file)
--- a/okular/generators/xps/generator_xps.cpp
+++ b/okular/generators/xps/generator_xps.cpp
@@ -447,10 +447,10 @@ static QPainterPath parseRscRefPath( const QString &data )
 /**
    \return The path of the entry
 */
-static QString entryPath( const QString &entry )
+static QString entryPath(const QString &entry )
 {
     const int index = entry.lastIndexOf( QChar::fromLatin1( '/' ) );
-    QString ret = QString::fromLatin1( "/" ) + entry.mid( 0, index );
+    QString ret = entry.mid( 0, index );
     if ( index > 0 ) {
         ret.append( QChar::fromLatin1( '/' ) );
     }
@@ -462,18 +462,19 @@ static QString entryPath( const QString &entry )
 */
 static QString entryPath( const KArchiveEntry* entry )
 {
-    return entryPath( QFile::decodeName(entry->pathname) );
+    return QFile::decodeName(entry->pathname);
 }
 
 /**
    \return The absolute path of the \p location, according to \p path if it's non-absolute
+   \note ZIP paths are not actually absolute, they must not start with slash
 */
 static QString absolutePath( const QString &path, const QString &location )
 {
     QString retPath;
     if ( location.at( 0 ) == QLatin1Char( '/' ) ) {
         // already absolute
-        retPath = location;
+        retPath = location.mid(1, location.size() - 1);
     } else {
         KUrl url = KUrl::fromPath( path );
         url.setFileName( location );