rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.33, 1.34 openoffice.org.spec, 1.1308, 1.1309
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Oct 2 12:41:25 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12067
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/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 16 Aug 2007 07:04:22 -0000 1.33
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 2 Oct 2007 12:41:22 -0000 1.34
@@ -876,7 +876,7 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -622,15 +922,309 @@
+@@ -622,15 +922,321 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
@@ -1110,8 +1110,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/devel/openoffice.org.spec,v
retrieving revision 1.1308
retrieving revision 1.1309
diff -u -r1.1308 -r1.1309
--- openoffice.org.spec 2 Oct 2007 11:25:32 -0000 1.1308
+++ openoffice.org.spec 2 Oct 2007 12:41:22 -0000 1.1309
@@ -2780,6 +2780,7 @@
%changelog
* Tue Oct 02 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-5.2
- Resolves: rhbz#299391 Serbian langpack name update
+- Resolves: rhbz#286221 allow custom printing commands
* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.0-5.1
- release candidate
More information about the fedora-extras-commits
mailing list