[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                                     |    2 ++
 patches/dev300/win32-pdfimport-assume-no-encryption.diff |   12 ++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit e840834e63968f37674f57ea2e644d6c47779f9a
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 13 10:51:33 2010 +0100

    Assume no encryption of pdf files (works around bnc#569319)
    
    * patches/dev300/apply:
    * patches/dev300/win32-pdfimport-assume-no-encryption.diff: Because of some
    locking issued the encryption test always determines that a PDF file is
    encrypted. Before we really understand the underlying locking issue, disable
    the encryption test for win32 and assume that the files are not encrypted.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index dc99e2a..e484a97 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3259,6 +3259,8 @@ boost-1.39-extra-header.diff, kohei
 [ Win32Only ]
 win32-boost-crack.diff
 
+win32-pdfimport-assume-no-encryption.diff, n#569319, fridrich
+
 [ NovellOnly ]
 # remove Macro Recorder from UI since it is borked by design
 basctl-no-macro-recorder-in-ui.diff, fridrich
diff --git a/patches/dev300/win32-pdfimport-assume-no-encryption.diff b/patches/dev300/win32-pdfimport-assume-no-encryption.diff
new file mode 100644
index 0000000..1155483
--- /dev/null
+++ b/patches/dev300/win32-pdfimport-assume-no-encryption.diff
@@ -0,0 +1,12 @@
+--- sdext/source/pdfimport/wrapper/wrapper.cxx	2010-01-13 10:39:42.000000000 +0100
++++ sdext/source/pdfimport/wrapper/wrapper.cxx	2010-01-13 10:41:01.000000000 +0100
+@@ -827,6 +827,9 @@
+                              bool&                                              o_rIsEncrypted
+                              )
+ {
++    // Ugly temporary workaround to some file-locking
++    return true;
++
+     bool bSuccess = false;
+     rtl::OString aPDFFile;
+     aPDFFile = rtl::OUStringToOString( i_rPath, osl_getThreadTextEncoding() );