rpms/openoffice.org/devel openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch, NONE, 1.1 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.12, 1.13 openoffice.org.spec, 1.924, 1.925
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Nov 9 10:48:33 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5020
Modified Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org.spec
Added Files:
openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
Log Message:
rhbz#213996
openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch:
inc/psprint/printerjob.hxx | 2 -
source/printergfx/printerjob.cxx | 45 +++++++++++++++++++--------------------
2 files changed, 24 insertions(+), 23 deletions(-)
--- NEW FILE openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch ---
--- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx 2005-09-08 18:35:45.000000000 +0200
+++ openoffice.org/psprint/inc/psprint/printerjob.hxx 2006-05-16 20:23:54.000000000 +0200
@@ -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& );
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 2006-05-04 10:41:55.000000000 +0200
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 2006-05-16 20:23:10.000000000 +0200
@@ -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];
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
inc/jobset.hxx | 0
inc/print.hxx | 0
inc/psprint/ppdparser.hxx | 0
psprint/inc/psprint/ppdparser.hxx | 4
psprint/source/printer/cupsmgr.cxx | 7
psprint/source/printergfx/printerjob.cxx | 3
source/dialogs/makefile.mk | 0
source/dialogs/printdlg.cxx | 0
source/gdi/jobset.cxx | 0
source/printer/cupsmgr.cxx | 0
source/printergfx/printerjob.cxx | 0
svtools/source/dialogs/makefile.mk | 4
svtools/source/dialogs/printdlg.cxx | 311 ++++++++++++++++++++++++++++++-
svtools/util/makefile.mk | 8
util/makefile.mk | 0
vcl/inc/jobset.hxx | 1
vcl/inc/print.hxx | 1
vcl/source/gdi/jobset.cxx | 174 +++++++++++++++++
18 files changed, 502 insertions(+), 11 deletions(-)
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jun 2006 09:52:23 -0000 1.12
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 9 Nov 2006 10:48:30 -0000 1.13
@@ -1,3 +1,20 @@
+Index: source/printergfx/printerjob.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
+retrieving revision 1.40
+diff -u -r1.40 printerjob.cxx
+--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40
++++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000
+@@ -740,6 +744,9 @@
+ if( ! pKey || ! pValue )
+ return true;
+
++ if (pValue->m_bCupsOnly)
++ return true;
++
+ String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) );
+ aFeature += pKey->getKey();
+ aFeature += ' ';
Index: inc/psprint/ppdparser.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
@@ -5,7 +22,16 @@
diff -u -r1.9 ppdparser.hxx
--- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 8 Sep 2005 16:34:44 -0000 1.9
+++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 19 May 2006 13:15:15 -0000
-@@ -139,7 +139,7 @@
+@@ -61,6 +61,8 @@
+ String m_aOptionTranslation;
+ String m_aValue;
+ String m_aValueTranslation;
++ bool m_bCupsOnly;
++ PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {}
+ };
+
+ // ----------------------------------------------------------------------
+@@ -139,7 +141,7 @@
typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDKey* > value_type;
@@ -107,7 +133,7 @@
// =======================================================================
DBG_NAME( JobSetup );
-@@ -241,6 +242,178 @@
+@@ -241,6 +242,179 @@
mpData = new ImplJobSetup();
mpData->maValueMap[ rKey ] = rValue;
@@ -275,6 +301,7 @@
+ PPDKey* pKey = new PPDKey( rKey );
+ PPDValue* pValue = pKey->insertValue(rValue);
+ pValue->m_eType = eInvocation;
++ pValue->m_bCupsOnly = true;
+ pValue->m_aValue = rValue;
+ const_cast<PPDParser*>(aInfo.m_pParser)->insertKey( rKey, pKey );
+ aInfo.m_aContext.setValue(pKey, pValue);
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- openoffice.org.spec 8 Nov 2006 10:28:36 -0000 1.924
+++ openoffice.org.spec 9 Nov 2006 10:48:30 -0000 1.925
@@ -1,6 +1,6 @@
%define oootag OOE680
%define ooomilestone 2
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# gcc#19664#
%define stlvisibilityfcked 1
@@ -124,6 +124,7 @@
Patch58: openoffice.org-2.1.0.ooo71078.pyuno.correctrelease.patch
Patch59: openoffice.org-2.0.4.rh213710.vba.patch
Patch60: openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch
+Patch61: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -984,6 +985,7 @@
%patch58 -p1 -b .ooo71078.pyuno.correctrelease.patch
%patch59 -p1 -b .rh213710.vba.patch
%patch60 -p1 -b .ooo71285.tools.ulongmax.patch
+%patch61 -p1 -b .ooo65491.psprint.enablenups.patch
tar xzf %{SOURCE1}
@@ -2507,6 +2509,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue Nov 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.2
+- Resolves: rhbz#213996 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+- Resolves: rhbz#213996 distinguish properly between ppd and cups option
+
* Tue Nov 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.1
- next upstream
- drop upstreamed openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
More information about the fedora-cvs-commits
mailing list