rpms/openoffice.org/F-7 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.32, 1.33 openoffice.org.spec, 1.1190, 1.1191

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#286221 allow custom printing commands

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	26 Jul 2007 20:16:50 -0000	1.32
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	2 Oct 2007 12:44:56 -0000	1.33
@@ -874,7 +874,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,309 @@
+@@ -625,15 +908,321 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -1108,8 +1108,20 @@
 +					}
 +					else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
 +					{
-+						pStr = gtk_printer_get_name(pPrinter);
-+						sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++					    pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
++					    if (pStr && *pStr)
++					    {
++						    sNewPrinterName = ASCII_STR("Generic Printer");
++                           psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++                           psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName);
++                           aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++                           rManager.changePrinterInfo(sNewPrinterName, aInfo);
++					    }
++					    else
++					    {
++						    pStr = gtk_printer_get_name(pPrinter);
++						    sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++					    }
 +					}
 +					
 +					OUString sOldPrinterName(mpPrinter->GetName());


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -u -r1.1190 -r1.1191
--- openoffice.org.spec	17 Sep 2007 08:42:51 -0000	1.1190
+++ openoffice.org.spec	2 Oct 2007 12:44:56 -0000	1.1191
@@ -2680,6 +2680,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Oct 02 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.3UNRELEASED
+- Resolves: rhbz#286221 allow custom printing commands
+
 * Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.2.1-18.2
 - Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch
 
@@ -2694,8 +2697,6 @@
 - Resolves: rhbz#249568 empty line in autocorrect options
 - Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
 - Resolves: rhbz#244656 overlapping glyphs in pdf export
-- Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
-- Resolves: rhbz#243904 add openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
 - Resolves: rhbz#216332 use cups for all duplex and printer features
 - update setlangtolocale for prettier fonts when appropiate langpack is missing
 - add openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch