From a7cb8e1d3cae714a51e76db48d26e22b561e5acc Mon Sep 17 00:00:00 2001 From: Fabio D'Urso Date: Sat, 18 May 2013 13:38:13 +0200 Subject: [PATCH] Compile with Poppler < 0.20 I had added this special case because Poppler < 0.20 stored garbage in the DOM node corresponding to inplaceText (but good data in contents). This code copied the good value into inplaceText, so that our UI code, which used to show the user what it read from inplaceText, showed the good value instead. Now that Okular only has contents, this special handling is no longer needed. --- generators/poppler/annots.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/generators/poppler/annots.cpp b/generators/poppler/annots.cpp index 3694188cd..f9bb81ebe 100644 --- a/generators/poppler/annots.cpp +++ b/generators/poppler/annots.cpp @@ -398,14 +398,7 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation * { Okular::TextAnnotation * txtann = static_cast( annotation ); - if ( txtann->textType() == Okular::TextAnnotation::InPlace ) - { -#ifndef HAVE_POPPLER_0_20 - // Poppler before 0.20 returns the inplaceText in contents - txtann->setInplaceText( txtann->contents() ); -#endif - } - else if ( txtann->textType() == Okular::TextAnnotation::Linked ) + if ( txtann->textType() == Okular::TextAnnotation::Linked ) { Poppler::TextAnnotation * ppl_txtann = static_cast( ann );