rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.49, 1.50 openoffice.org.spec, 1.1679, 1.1680

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#468935 Print to file can have no effect in an edge-case

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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	1 Sep 2008 12:09:08 -0000	1.49
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	29 Oct 2008 09:16:22 -0000	1.50
@@ -1072,7 +1072,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -775,15 +1060,329 @@
+@@ -775,15 +1060,331 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -1302,11 +1302,7 @@
 + 					rtl::OUString sNewPrinterName(mpPrinter->GetName());
 + 
 + 					if (sPath.getLength())
-+ 					{
-+ 						mpPrinter->EnablePrintFile(true);
-+ 						mpPrinter->SetPrintFile(sPath);
 + 						sNewPrinterName = ASCII_STR("Generic Printer");
-+ 					}
 + 					else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
 + 					{
 + 					    pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
@@ -1355,6 +1351,13 @@
 + 						}
 + 					}
 + 					mpPrinter->Reset();
++ 					
++ 					if (sPath.getLength())
++ 					{
++ 						mpPrinter->EnablePrintFile(true);
++ 						mpPrinter->SetPrintFile(sPath);
++ 					}
++ 					
 +	                if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
 + 						mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
 +	                else


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1679
retrieving revision 1.1680
diff -u -r1.1679 -r1.1680
--- openoffice.org.spec	28 Oct 2008 16:46:34 -0000	1.1679
+++ openoffice.org.spec	29 Oct 2008 09:16:22 -0000	1.1680
@@ -3728,9 +3728,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Oct 28 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.7
+* Wed Oct 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.7
 - Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 - workspace.impress163.patch
+- Resolves: rhbz#468935 Print to file can have no effect in an edge-case
 
 * Thu Oct 23 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.6
 - add openoffice.org-3.0.0.ooo95318.system-showicons.patch to honour