[poppler] poppler/qt4/src: poppler-page.cc,1.25,1.25.2.1

[Albert Astals Cid]

Update of /cvs/poppler/poppler/qt4/src
In directory kemper:/tmp/cvs-serv21598/qt4/src

Modified Files:
      Tag: POPPLER_0_5_X
	poppler-page.cc 
Log Message:
qt4/src/poppler-page.cc: PA is optional, H is a name not a string


Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-page.cc,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- poppler-page.cc	11 Sep 2006 21:20:56 -0000	1.25
+++ poppler-page.cc	30 Sep 2006 16:25:15 -0000	1.25.2.1
@@ -804,7 +804,7 @@
 
             // -> hlMode
             QString hlModeString;
-            XPDFReader::lookupString( annotDict, "H", hlModeString );
+            XPDFReader::lookupName( annotDict, "H", hlModeString );
             if ( hlModeString == "N" )
                 l->linkHLMode = LinkAnnotation::None;
             else if ( hlModeString == "I" )
@@ -835,13 +835,16 @@
             // reading link action
             Object objPA;
             annotDict->lookup( "PA", &objPA );
-            ::LinkAction * a = ::LinkAction::parseAction( &objPA, m_page->parentDoc->m_doc->doc.getCatalog()->getBaseURI() );
-            Link * popplerLink = m_page->convertLinkActionToLink( a, QRectF(), m_page->parentDoc->m_doc );
-            if ( popplerLink )
+            if (!objPA.isNull())
             {
-                l->linkDestination = popplerLink;
+                ::LinkAction * a = ::LinkAction::parseAction( &objPA, m_page->parentDoc->m_doc->doc.getCatalog()->getBaseURI() );
+                Link * popplerLink = m_page->convertLinkActionToLink( a, QRectF(), m_page->parentDoc->m_doc );
+                if ( popplerLink )
+                {
+                     l->linkDestination = popplerLink;
+                }
+                objPA.free();
             }
-            objPA.free();
         }
         else
         {