summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-12-14 23:56:34 +0100
committerAlbert Astals Cid <aacid@kde.org>2011-12-14 23:56:34 +0100
commitd2a11e205bae35aa05353c147f7648b7c19b906c (patch)
tree278b7c81234e2d94b3370b7e0304d943efba8b25
parent7bedab6d8f3800540606eb2522e4aadab332a17a (diff)
this was merged already
-rw-r--r--ALL_DIFF9
1 files changed, 0 insertions, 9 deletions
diff --git a/ALL_DIFF b/ALL_DIFF
index c2f2f8f..1d0bd4b 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -19371,15 +19371,6 @@ diff -ru xpdf-3.02/xpdf/TextOutputDev.cc xpdf-3.03/xpdf/TextOutputDev.cc
rawOrder = rawOrderA;
doHTML = gFalse;
ok = gTrue;
-@@ -3840,7 +4060,7 @@
- } else if ((outputStream = fopen(fileName, append ? "ab" : "wb"))) {
- needClose = gTrue;
- } else {
-- error(-1, "Couldn't open text file '%s'", fileName);
-+ error(errIO, -1, "Couldn't open text file '{0:s}'", fileName);
- ok = gFalse;
- return;
- }
@@ -3854,11 +4074,13 @@
}