diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 330a8bbaa..93c3219fb 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 39517ec1d..353cc5609 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( 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 322f94b72..98e72d6c6 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 99d5bd023..181176a15 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 d6fbdcfbd..7b75d1cdf 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"