rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.39, 1.40

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2117

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
Log Message:
don't use gnome printer dialog under kde

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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	8 Jan 2008 14:51:50 -0000	1.39
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	16 Jan 2008 12:12:01 -0000	1.40
@@ -986,7 +986,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -803,15 +1104,322 @@
+@@ -803,15 +1104,325 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -996,7 +996,10 @@
  
 -	// Wenn Dialog mit OK beendet wurde, dann die Daten updaten
 -	if( nRet == TRUE )
-+	if (SvtMiscOptions().UseSystemFileDialog())
++	if (
++	    SvtMiscOptions().UseSystemFileDialog() &&
++	    !Application::GetDesktopEnvironment().equalsIgnoreAsciiCaseAscii("kde")
++	   )
  	{
 -		if ( TEMPPRINTER() )
 -			mpPrinter->SetPrinterProps( TEMPPRINTER() );