[poppler] Branch 'poppler-0.24' - qt4/src qt5/src

[Albert Astals Cid]

 qt4/src/poppler-annotation.cc |    5 +++--
 qt5/src/poppler-annotation.cc |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 78c407ac7e8f48ae2d2c75ad0f5960390190d2e3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Nov 15 20:25:52 2013 +0100

    destionation -> destination
    
    And this is why the xml based api has to die
    
    Bug #71643
    Found by Hib

diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
index 08044c0..6d19065 100644
--- a/qt4/src/poppler-annotation.cc
+++ b/qt4/src/poppler-annotation.cc
@@ -1,5 +1,5 @@
 /* poppler-annotation.cc: qt interface to poppler
- * Copyright (C) 2006, 2009, 2012 Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2006, 2008, 2010 Pino Toscano <pino at kde.org>
  * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral at kde.org>
  * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
@@ -3657,7 +3657,8 @@ void LinkAnnotation::store( QDomNode & node, QDomDocument & document ) const
                 Poppler::LinkGoto * go = static_cast< Poppler::LinkGoto * >( linkDestination() );
                 hyperlinkElement.setAttribute( "type", "GoTo" );
                 hyperlinkElement.setAttribute( "filename", go->fileName() );
-                hyperlinkElement.setAttribute( "destionation", go->destination().toString() );
+                hyperlinkElement.setAttribute( "destionation", go->destination().toString() ); // TODO Remove for poppler 0.28
+                hyperlinkElement.setAttribute( "destination", go->destination().toString() );
                 break;
             }
             case Poppler::Link::Execute:
diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
index 052e060..9a8b655 100644
--- a/qt5/src/poppler-annotation.cc
+++ b/qt5/src/poppler-annotation.cc
@@ -3644,7 +3644,8 @@ void LinkAnnotation::store( QDomNode & node, QDomDocument & document ) const
                 Poppler::LinkGoto * go = static_cast< Poppler::LinkGoto * >( linkDestination() );
                 hyperlinkElement.setAttribute( "type", "GoTo" );
                 hyperlinkElement.setAttribute( "filename", go->fileName() );
-                hyperlinkElement.setAttribute( "destionation", go->destination().toString() );
+                hyperlinkElement.setAttribute( "destionation", go->destination().toString() ); // TODO remove for poppler 0.28
+                hyperlinkElement.setAttribute( "destination", go->destination().toString() );
                 break;
             }
             case Poppler::Link::Execute: