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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Sep  4 08:27:07 2008
New Revision: 13784
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13784&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/pdfimport-lax-restrictions-m29.diff: split patch,
    as pdfimport has moved to sdext module



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Sep  4 08:27:07 2008
@@ -2610,8 +2610,10 @@
 
 [ Fixes < dev300-m30 < ooo300-m3 ]
 pdfimport-system-poppler-m29.diff, i#92920, cmc
+pdfimport-lax-restrictions-m29.diff, i#90468, thorsten
 [ Fixes == dev300-m30 == ooo300-m3 ]
 pdfimport-system-poppler-m30.diff, i#92920, cmc
+pdfimport-lax-restrictions.diff, i#90468, thorsten
 [ Fixes >= dev300-m31 >= ooo300-m4 ]
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten

Added: trunk/patches/dev300/pdfimport-lax-restrictions-m29.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pdfimport-lax-restrictions-m29.diff	Thu Sep  4 08:27:07 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) );
+ 

Modified: trunk/patches/dev300/pdfimport-lax-restrictions.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-lax-restrictions.diff	(original)
+++ trunk/patches/dev300/pdfimport-lax-restrictions.diff	Thu Sep  4 08:27:07 2008
@@ -1,7 +1,7 @@
 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
+--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
 @@ -146,14 +146,7 @@ int main(int argc, char **argv)