summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2014-10-02 11:43:03 (GMT)
committerMontel Laurent <montel@kde.org>2014-10-02 11:43:03 (GMT)
commit89bb5562ac2f8488c32d9d86fb9746e3ef6f5d98 (patch)
tree56f1323caf79b9f9e479099a364cbab1a6dc1455
parent5b88e93891391ce620976659ddbf643f4dfa0dff (diff)
Reactivate some generator
-rw-r--r--generators/CMakeLists.txt4
-rw-r--r--generators/fictionbook/converter.cpp2
-rw-r--r--generators/fictionbook/generator_fb.cpp2
-rw-r--r--generators/ooo/converter.cpp2
-rw-r--r--generators/ooo/generator_ooo.cpp1
5 files changed, 7 insertions, 4 deletions
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 330a8bb..93c3219 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -108,9 +108,9 @@ endif(TIFF_FOUND)
add_subdirectory(xps)
-#add_subdirectory(ooo)
+add_subdirectory(ooo)
-#add_subdirectory(fictionbook)
+add_subdirectory(fictionbook)
add_subdirectory(comicbook)
diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp
index 39517ec..353cc56 100644
--- a/generators/fictionbook/converter.cpp
+++ b/generators/fictionbook/converter.cpp
@@ -763,7 +763,7 @@ bool Converter::convertLink( const QDomElement &element )
mLocalLinks.insert( href.mid( 1 ), QPair<int, int>( startPosition, endPosition ) );
} else {
// external link
- Okular::BrowseAction *action = new Okular::BrowseAction( href );
+ Okular::BrowseAction *action = new Okular::BrowseAction( QUrl(href) );
emit addAction( action, startPosition, endPosition );
}
diff --git a/generators/fictionbook/generator_fb.cpp b/generators/fictionbook/generator_fb.cpp
index 322f94b..98e72d6 100644
--- a/generators/fictionbook/generator_fb.cpp
+++ b/generators/fictionbook/generator_fb.cpp
@@ -43,3 +43,5 @@ void FictionBookGenerator::addPages( KConfigDialog* dlg )
dlg->addPage( widget, generalSettings(), i18n("FictionBook"), "okular-fb2", i18n("FictionBook Backend Configuration") );
}
+#include "generator_fb.moc"
+
diff --git a/generators/ooo/converter.cpp b/generators/ooo/converter.cpp
index 99d5bd0..181176a 100644
--- a/generators/ooo/converter.cpp
+++ b/generators/ooo/converter.cpp
@@ -553,7 +553,7 @@ bool Converter::convertLink( QTextCursor *cursor, const QDomElement &element, co
int endPosition = cursor->position();
- Okular::Action *action = new Okular::BrowseAction( element.attribute( "href" ) );
+ Okular::Action *action = new Okular::BrowseAction( QUrl(element.attribute( "href" )) );
emit addAction( action, startPosition, endPosition );
return true;
diff --git a/generators/ooo/generator_ooo.cpp b/generators/ooo/generator_ooo.cpp
index d6fbdcf..7b75d1c 100644
--- a/generators/ooo/generator_ooo.cpp
+++ b/generators/ooo/generator_ooo.cpp
@@ -51,3 +51,4 @@ void KOOOGenerator::walletDataForFile( const QString &fileName, QString *walletN
*walletName = KWallet::Wallet::LocalWallet();
*walletFolder = KWallet::Wallet::PasswordFolder();
}
+#include "generator_ooo.moc"