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.
remotes/origin/epub-qtextdoc
Fabio D'Urso 13 years ago
parent edcf708a99
commit a7cb8e1d3c
  1. 9
      generators/poppler/annots.cpp

@ -398,14 +398,7 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation *
{
Okular::TextAnnotation * txtann = static_cast<Okular::TextAnnotation*>( 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<Poppler::TextAnnotation*>( ann );

Loading…
Cancel
Save