From aea558050ef31e9785dd27536eebbb52c5ad9c63 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 13 May 2009 14:06:54 +0000 Subject: [PATCH] make use of the very recent new poppler api to create named destination actions svn path=/trunk/KDE/kdegraphics/okular/; revision=967521 --- generators/poppler/generator_pdf.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index a63feb115..003aafe7d 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -170,9 +170,25 @@ Okular::Action* createLinkFromPopplerLink(const Poppler::Link *popplerLink) break; case Poppler::Link::Goto: + { popplerLinkGoto = static_cast(popplerLink); +#ifdef HAVE_POPPLER_0_11 + const Poppler::LinkDestination dest = popplerLinkGoto->destination(); + const QString destName = dest.destinationName(); + if (destName.isEmpty()) + { + fillViewportFromLinkDestination( viewport, dest ); + link = new Okular::GotoAction(popplerLinkGoto->fileName(), viewport); + } + else + { + link = new Okular::GotoAction(popplerLinkGoto->fileName(), destName); + } +#else fillViewportFromLinkDestination( viewport, popplerLinkGoto->destination() ); link = new Okular::GotoAction(popplerLinkGoto->fileName(), viewport); +#endif + } break; case Poppler::Link::Execute: