rpms/openoffice.org/devel workspace.printerpullpages.patch, NONE, 1.1 openoffice.org.spec, 1.2032, 1.2033 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch, 1.2, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18960

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.printerpullpages.patch 
Removed Files:
	openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch 
Log Message:
wiki xslts gone

workspace.printerpullpages.patch:
 inc/vcl/printerjob.hxx               |    2 -
 unx/source/printergfx/printerjob.cxx |   45 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

--- NEW FILE workspace.printerpullpages.patch ---
--- vcl/inc/vcl/printerjob.hxx
+++ vcl/inc/vcl/printerjob.hxx
@@ -99,7 +99,7 @@ private:            // private methods
 
     bool			writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
     bool            writeSetup( osl::File* pFile, const JobData& );
-    bool            writePageSetup( osl::File* pFile, const JobData& );
+    bool            writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true );
     void			writeJobPatch( osl::File* File, const JobData& );
     bool            writeProlog (osl::File* pFile, const JobData& );
 
--- vcl/unx/source/printergfx/printerjob.cxx
+++ vcl/unx/source/printergfx/printerjob.cxx
@@ -1047,14 +1047,6 @@ PrinterJob::StartPage (const JobData& rJ
     if( ! (pPageHeader && pPageBody) )
         return sal_False;
 
-    /* #i7262# write setup only before first page
-     *  don't do this in StartJob since the jobsetup there may be
-     *  different.
-     */ 
-    bool bSuccess =  true;
-    if( 1 == maPageList.size() )
-        m_aDocumentJobData = rJobSetup;
-
     // write page header according to Document Structuring Conventions (DSC)
     WritePS (pPageHeader, "%%Page: ");
     WritePS (pPageHeader, aPageNo); 
@@ -1077,13 +1069,25 @@ PrinterJob::StartPage (const JobData& rJ
 
     WritePS (pPageHeader, pBBox);
 
-    if (bSuccess)
-        bSuccess = writePageSetup ( pPageHeader, rJobSetup );
-    if(bSuccess)
-        m_aLastJobData = rJobSetup;
+    /* #i7262# #i65491# write setup only before first page
+     *  (to %%Begin(End)Setup, instead of %%Begin(End)PageSetup)
+     *  don't do this in StartJob since the jobsetup there may be
+     *  different.
+     */ 
+    bool bWriteFeatures = true;
+    if( 1 == maPageList.size() )
+    {
+        m_aDocumentJobData = rJobSetup;
+        bWriteFeatures = false;
+    }
 
+    if ( writePageSetup( pPageHeader, rJobSetup, bWriteFeatures ) )
+    {
+        m_aLastJobData = rJobSetup;
+        return true;
+    }
         
-    return bSuccess;
+    return false;
 }
 
 sal_Bool
@@ -1174,12 +1178,9 @@ bool PrinterJob::writeFeatureList( osl::
                 if( pKey->getSetupType()    == PPDKey::DocumentSetup )
                     bEmit = true;
             }
-            else
-            {
-                if( pKey->getSetupType()    == PPDKey::PageSetup        ||
-                    pKey->getSetupType()    == PPDKey::AnySetup )
-                    bEmit = true;
-            }
+            if( pKey->getSetupType()    == PPDKey::PageSetup        ||
+                pKey->getSetupType()    == PPDKey::AnySetup )
+                bEmit = true;
             if( bEmit )
             {
                 const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
@@ -1213,13 +1214,13 @@ bool PrinterJob::writeFeatureList( osl::
     return bSuccess;
 }
 
-bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob )
+bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob, bool bWriteFeatures )
 {
     bool bSuccess = true;
 
     WritePS (pFile, "%%BeginPageSetup\n%\n");
-
-    bSuccess = writeFeatureList( pFile, rJob, false );
+    if ( bWriteFeatures )
+        bSuccess = writeFeatureList( pFile, rJob, false );
     WritePS (pFile, "%%EndPageSetup\n");
 
     sal_Char  pTranslate [128];


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -p -r1.2032 -r1.2033
--- openoffice.org.spec	13 Oct 2009 09:54:56 -0000	1.2032
+++ openoffice.org.spec	13 Oct 2009 12:27:55 -0000	1.2033
@@ -77,7 +77,7 @@ Patch5:  openoffice.org-2.0.1.ooo58606.s
 Patch6:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch7:  openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
 Patch8:  openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch9:  openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch9:  workspace.printerpullpages.patch
 %if %{gtkprintui}
 Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
 %endif
@@ -1584,7 +1584,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch6  -p1
 %patch7  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
 %patch8  -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch9  -p0 -b .ooo65491.psprint.enablenups.patch
+%patch9  -p0 -b .workspace.printerpullpages.patch
 %if %{gtkprintui}
 cat %{PATCH10} >> svtools/source/dialogs/localize.sdf
 %endif
@@ -3882,7 +3882,6 @@ update-desktop-database %{_datadir}/appl
 %{basisinstdir}/share/xslt/export/xhtml
 %dir %{basisinstdir}/share/xslt/import
 %{basisinstdir}/share/xslt/import/uof
-%{basisinstdir}/share/xslt/wiki/
 
 %files javafilter
 %defattr(-,root,root,-)


--- openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch DELETED ---