[poppler] 3 commits - qt4/src qt4/tests

[Brad Hards]

 qt4/src/poppler-form.h         |    8 ++++----
 qt4/tests/test-poppler-qt4.cpp |    6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
Merge: 1c7b7a0... 7875067...
Author: Brad Hards <bradh at kde.org>
Date:   Mon Nov 5 15:55:39 2007 +1100

    Merge branch 'minor-fixes'

commit 78750679e213d7307cce38166b6af32562e871b8
Author: Brad Hards <bradh at kde.org>
Date:   Mon Nov 5 15:54:36 2007 +1100

    Additional check for password protected documents
    
    We need to bail out on locked documents. In the future,
    we could probably go interactive, and ask the user for
    a password.

diff --git a/qt4/tests/test-poppler-qt4.cpp b/qt4/tests/test-poppler-qt4.cpp
index 4785312..299335d 100644
--- a/qt4/tests/test-poppler-qt4.cpp
+++ b/qt4/tests/test-poppler-qt4.cpp
@@ -111,6 +111,12 @@ int main( int argc, char **argv )
 	qWarning() << "doc not loaded";
 	exit(1);
     }
+
+    if (doc->isLocked())
+    {
+	qWarning() << "document locked (needs password)";
+	exit(0);
+    }
   
     // output some meta-data
     qDebug() << "    PDF Version: " << doc->pdfVersion();
commit 1c7b7a0c581b542945cac257202bbb819d33694c
Author: Brad Hards <bradh at kde.org>
Date:   Mon Nov 5 15:49:45 2007 +1100

    Minor Qt4 API documentation fix
    
    Also, this is a test of my git newbie-ness.

diff --git a/qt4/src/poppler-form.h b/qt4/src/poppler-form.h
index 343c2ca..47724fa 100644
--- a/qt4/src/poppler-form.h
+++ b/qt4/src/poppler-form.h
@@ -202,16 +202,16 @@ namespace Poppler {
 	QStringList choices() const;
 
 	/**
-	  Whether this \ref ComboBox is editable, ie the user can type in a
-	  custom value.
+	  Whether this FormFieldChoice::ComboBox is editable, i.e. the user
+	  can type in a custom value.
 
 	  Always false for the other types of choices.
 	 */
 	bool isEditable() const;
 
 	/**
-	  Whether more than one choice of this \ref ListBox can be selected at
-	  the same time.
+	  Whether more than one choice of this FormFieldChoice::ListBox
+	  can be selected at the same time.
 
 	  Always false for the other types of choices.
 	 */