rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.19, 1.20
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 30 11:28:38 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8503
Modified Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
Log Message:
more goodies
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
inc/jobset.hxx | 0
inc/print.hxx | 0
inc/printdlg.hxx | 0
openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10
psprint/inc/cupsmgr.hxx | 2
psprint/inc/psprint/ppdparser.hxx | 4
psprint/inc/psprint/printerinfomanager.hxx | 2
psprint/source/printer/cupsmgr.cxx | 18
psprint/source/printer/printerinfomanager.cxx | 8
psprint/source/printergfx/printerjob.cxx | 3
source/dialogs/makefile.mk | 0
source/dialogs/printdlg.cxx | 0
source/dialogs/printdlg.hrc | 0
source/dialogs/printdlg.src | 0
source/gdi/jobset.cxx | 0
source/gdi/print.cxx | 0
svtools/inc/printdlg.hxx | 2
svtools/source/dialogs/makefile.mk | 4
svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++-
svtools/source/dialogs/printdlg.hrc | 2
svtools/util/makefile.mk | 8
util/makefile.mk | 0
vcl/inc/jobset.hxx | 3
vcl/inc/print.hxx | 3
vcl/source/gdi/jobset.cxx | 194 +++++
vcl/source/gdi/print.cxx | 11
26 files changed, 792 insertions(+), 12 deletions(-)
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 10:04:52 -0000 1.19
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 11:28:36 -0000 1.20
@@ -1,45 +1,3 @@
-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 +740,9 @@
- if( ! pKey || ! pValue )
- return true;
-
-+ if (pValue->m_bCupsOnly)
-+ return true;
-+
- OStringBuffer aFeature(256);
- aFeature.append( "[{\n" );
- if( bUseIncluseFeature )
-Index: inc/psprint/ppdparser.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
-retrieving revision 1.9
-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
-@@ -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;
--
-+public:
- void insertKey( const String& rKey, PPDKey* pKey );
- public:
- struct PPDConstraint
Index: source/dialogs/makefile.mk
===================================================================
RCS file: /cvs/util/svtools/source/dialogs/makefile.mk,v
@@ -344,99 +302,6 @@
}
// -----------------------------------------------------------------------
-Index: source/printer/cupsmgr.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/cupsmgr.cxx,v
-retrieving revision 1.12
-diff -u -p -u -r1.12 cupsmgr.cxx
---- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12
-+++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000
-@@ -407,10 +407,15 @@
- m_pDests( NULL ),
- m_bNewDests( false )
- {
-+ startsearch();
-+}
-+
-+void CUPSManager::startsearch()
-+{
- m_aDestThread = osl_createThread( run_dest_thread_stub, this );
- }
-
--CUPSManager::~CUPSManager()
-+void CUPSManager::stopsearch()
- {
- if( m_aDestThread )
- {
-@@ -422,6 +427,11 @@
-
- if( m_nDests && m_pDests )
- m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
-+}
-+
-+CUPSManager::~CUPSManager()
-+{
-+ stopsearch();
- delete m_pCUPSWrapper;
- }
-
-@@ -475,9 +485,10 @@
-
- // clear old stuff
- m_aCUPSDestMap.clear();
--
-+#if 0
- if( ! (m_nDests && m_pDests ) )
- return;
-+#endif
-
- // check for CUPS server(?) > 1.2
- // since there is no API to query, check for options that were
-@@ -569,6 +580,10 @@
-
- m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
- #endif // ENABLE_CUPS
-+
-+ addPrinter(rtl::OUString::createFromAscii("Generic Printer"),
-+ rtl::OUString::createFromAscii("SGENPRT"));
-+
- }
-
- #ifdef ENABLE_CUPS
-Index: inc/cupsmgr.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v
-retrieving revision 1.9
-diff -u -r1.9 cupsmgr.hxx
---- openoffice.org.orig/psprint/inc/cupsmgr.hxx 10 Jul 2006 16:29:13 -0000 1.9
-+++ openoffice.org/psprint/inc/cupsmgr.hxx 29 Jan 2007 13:36:19 -0000
-@@ -99,7 +99,9 @@
- virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo );
-
- // check if the printer configuration has changed
-+ virtual void startsearch ();
- virtual bool checkPrintersChanged( bool bWait );
-+ virtual void stopsearch ();
-
- // members for administration (->padmin)
- // disable for CUPS
-Index: inc/psprint/printerinfomanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v
-retrieving revision 1.15.2.1
-diff -u -r1.15.2.1 printerinfomanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 24 Jan 2007 15:06:04 -0000 1.15.2.1
-+++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 29 Jan 2007 13:36:31 -0000
-@@ -188,7 +188,9 @@
- // check if the printer configuration has changed
- // if bwait is true, then this method waits for eventual asynchronous
- // printer discovery to finish
-+ virtual void startsearch();
- virtual bool checkPrintersChanged( bool bWait );
-+ virtual void stopsearch();
-
- // members for administration (->padmin)
-
Index: inc/printdlg.hxx
===================================================================
RCS file: /cvs/util/svtools/inc/printdlg.hxx,v
@@ -1089,9 +954,111 @@
Text [ x-comment ] = " ";
};
---- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000
-+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000
-@@ -137,6 +137,14 @@
+diff -ru psprint/inc/cupsmgr.hxx psprint/inc/cupsmgr.hxx
+--- openoffice.org.orig/psprint/inc/cupsmgr.hxx 2007-01-30 06:18:23.000000000 -0500
++++ openoffice.org/psprint/inc/cupsmgr.hxx 2007-01-30 06:22:54.000000000 -0500
+@@ -99,7 +99,9 @@
+ virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo );
+
+ // check if the printer configuration has changed
++ virtual void startsearch ();
+ virtual bool checkPrintersChanged( bool bWait );
++ virtual void stopsearch ();
+
+ // members for administration (->padmin)
+ // disable for CUPS
+diff -ru psprint/inc/psprint/ppdparser.hxx psprint/inc/psprint/ppdparser.hxx
+--- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 2007-01-30 06:18:23.000000000 -0500
++++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 2007-01-30 06:22:53.000000000 -0500
+@@ -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;
+-
++public:
+ void insertKey( const String& rKey, PPDKey* pKey );
+ public:
+ struct PPDConstraint
+diff -ru psprint/inc/psprint/printerinfomanager.hxx psprint/inc/psprint/printerinfomanager.hxx
+--- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 2007-01-30 06:18:24.000000000 -0500
++++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 2007-01-30 06:22:54.000000000 -0500
+@@ -180,7 +180,9 @@
+ // check if the printer configuration has changed
+ // if bwait is true, then this method waits for eventual asynchronous
+ // printer discovery to finish
++ virtual void startsearch();
+ virtual bool checkPrintersChanged( bool bWait );
++ virtual void stopsearch();
+
+ // members for administration (->padmin)
+
+diff -ru psprint/source/printer/cupsmgr.cxx psprint/source/printer/cupsmgr.cxx
+--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 2007-01-30 06:18:26.000000000 -0500
++++ openoffice.org/psprint/source/printer/cupsmgr.cxx 2007-01-30 06:24:26.000000000 -0500
+@@ -397,10 +397,15 @@
+ m_pDests( NULL ),
+ m_bNewDests( false )
+ {
++ startsearch();
++}
++
++void CUPSManager::startsearch()
++{
+ m_aDestThread = osl_createThread( run_dest_thread_stub, this );
+ }
+
+-CUPSManager::~CUPSManager()
++void CUPSManager::stopsearch()
+ {
+ if( m_aDestThread )
+ {
+@@ -412,6 +417,11 @@
+
+ if( m_nDests && m_pDests )
+ m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
++}
++
++CUPSManager::~CUPSManager()
++{
++ stopsearch();
+ delete m_pCUPSWrapper;
+ }
+
+@@ -466,8 +476,10 @@
+ // clear old stuff
+ m_aCUPSDestMap.clear();
+
++#if 0
+ if( ! (m_nDests && m_pDests ) )
+ return;
++#endif
+
+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
+ int nPrinter = m_nDests;
+@@ -547,6 +559,10 @@
+
+ m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
+ #endif // ENABLE_CUPS
++
++ addPrinter(rtl::OUString::createFromAscii("Generic Printer"),
++ rtl::OUString::createFromAscii("SGENPRT"));
++
+ }
+
+ #ifdef ENABLE_CUPS
+diff -ru psprint/source/printer/printerinfomanager.cxx psprint/source/printer/printerinfomanager.cxx
+--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 06:18:26.000000000 -0500
++++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-30 06:22:54.000000000 -0500
+@@ -129,6 +129,14 @@
// -----------------------------------------------------------------
@@ -1106,3 +1073,16 @@
bool PrinterInfoManager::checkPrintersChanged( bool bWait )
{
// check if files were created, deleted or modified since initialize()
+diff -ru psprint/source/printergfx/printerjob.cxx psprint/source/printergfx/printerjob.cxx
+--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 2007-01-30 06:18:27.000000000 -0500
++++ openoffice.org/psprint/source/printergfx/printerjob.cxx 2007-01-30 06:23:54.000000000 -0500
+@@ -737,6 +737,9 @@
+ if( ! pKey || ! pValue )
+ return true;
+
++ if (pValue->m_bCupsOnly)
++ return true;
++
+ String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) );
+ aFeature += pKey->getKey();
+ aFeature += ' ';
More information about the fedora-cvs-commits
mailing list