blob: c705d3e36b8183477e5e567599920a9e945d815b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- src/gui/pdfutil.cc.orig 2009-04-06 15:24:47 UTC
+++ src/gui/pdfutil.cc
@@ -451,7 +451,20 @@ QString annotTypeName(boost::shared_ptr<
@param askPassword If true, password will be asked for if necessary
*/
boost::shared_ptr<CPdf> getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword) {
- boost::shared_ptr<CPdf> pdf=CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(), mode);
+ boost::shared_ptr<pdfobjects::CPdf> pdf;
+ do {
+ try {
+ pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+ }catch(PdfOpenException &e) {
+ // try to fallback to readonly mode
+ if (mode >= CPdf::ReadWrite) {
+ mode = CPdf::ReadOnly;
+ continue;
+ }
+ throw e;
+ }
+ }while(!pdf);
+
if (askPassword && pdf->needsCredentials()) {
for(;;) {
//Ask for password until we either get the right one or user gets bored with retrying
|
