ooo-build r13780 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Sep  3 22:16:14 2008
New Revision: 13780
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13780&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/pdfimport-lax-restrictions.diff: removed pdf
    permission checks, which are just 99,9% annoying



Added:
   trunk/patches/dev300/pdfimport-lax-restrictions.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep  3 22:16:14 2008
@@ -2616,6 +2616,7 @@
 pdfimport-system-poppler-m30.diff, i#92920, cmc
 [ Fixes >= dev300-m31 >= ooo300-m4 ]
 pdfimport-system-poppler.diff, i#92920, cmc
+pdfimport-lax-restrictions.diff, i#90468, thorsten
 
 [ NovellOnlyWin32 ]
 i92372.diff, i#92372, n#353143, tml

Added: trunk/patches/dev300/pdfimport-lax-restrictions.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pdfimport-lax-restrictions.diff	Wed Sep  3 22:16:14 2008
@@ -0,0 +1,20 @@
+diff --git filter/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx filter/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index f597fc6..6b87e7c 100644
+--- filter/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ filter/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -146,14 +146,7 @@ int main(int argc, char **argv)
+    
+     
+    // Check various permissions.
+-   if ( !aDoc.isOk()||
+-        !aDoc.okToPrint() ||    
+-        !aDoc.okToChange()||
+-        !aDoc.okToCopy()||
+-        !aDoc.okToAddNotes()||
+-        (userPassword[0] != '\001')||
+-        (ownerPassword[0] != '\001')
+-      )
++   if ( !aDoc.isOk() )
+    {
+         pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aErrDoc) );
+