rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.8, 1.9 openoffice.org.spec, 1.740, 1.741

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20442

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
no need for hack now

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 inc/psprint/ppdparser.hxx           |    0 
 psprint/inc/psprint/ppdparser.hxx   |    2 
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  241 ++++++++++++++++++++++++++++++++++--
 svtools/util/makefile.mk            |    8 +
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  173 +++++++++++++++++++++++++
 14 files changed, 420 insertions(+), 10 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	25 May 2006 10:59:36 -0000	1.8
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 15:45:54 -0000	1.9
@@ -331,7 +331,7 @@
  using namespace com::sun::star::ui::dialogs;
  using namespace rtl;
  
-@@ -606,6 +635,90 @@
+@@ -606,6 +635,63 @@
  
  // -----------------------------------------------------------------------
  
@@ -392,37 +392,10 @@
 +    g_list_free( pChildren );
 +}
 +
-+static int TempHorrorHack(GtkContainer *pWidget, int nIn)
-+{
-+	bool bRet = false;
-+	GList *pChildren = gtk_container_get_children(pWidget);
-+	for( GList *p = pChildren; p; p = p->next )
-+	{
-+		GtkWidget *pData = GTK_WIDGET(p->data);
-+		if (!pData)
-+			continue;
-+		if (GTK_IS_COMBO_BOX(pData))
-+		{
-+			if (!strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(pData)), "All sheets"))
-+			{
-+				gtk_widget_set_sensitive(pData, false);
-+				pData = 0;
-+				++nIn;
-+			}
-+		}
-+		if (pData && GTK_IS_CONTAINER(pData))
-+			nIn = TempHorrorHack(GTK_CONTAINER(pData), nIn);
-+		if (nIn == 1)
-+			break;
-+	}
-+	g_list_free(pChildren);
-+	return nIn;
-+}
-+
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -621,15 +734,153 @@
+@@ -621,15 +707,155 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -443,12 +416,14 @@
 +			pDialog = gtk_print_unix_dialog_new (NULL, NULL);
 +			rtl::OString aOptions(OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
 +			aOptions = aOptions.replace('~','_');
++			gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(pDialog), 
++				GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | 
++				GTK_PRINT_CAPABILITY_REVERSE));
 +			dialog_remove_buttons( GTK_DIALOG( pDialog ) );
 +			gtk_dialog_add_button( GTK_DIALOG( pDialog ), aOptions.getStr(), 10);
 +			gtk_dialog_add_buttons (GTK_DIALOG (pDialog), 
 +				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_PRINT, GTK_RESPONSE_OK, NULL);
 +			//gtk_dialog_set_default_response (GTK_DIALOG (pDialog), GTK_RESPONSE_OK);
-+			TempHorrorHack(GTK_CONTAINER(pDialog),0);
 +		}
 +
 +		GtkPrintSettings* pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(pDialog));
@@ -583,7 +558,7 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -644,4 +895,3 @@
+@@ -644,4 +870,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.740
retrieving revision 1.741
diff -u -r1.740 -r1.741
--- openoffice.org.spec	22 Jun 2006 15:14:53 -0000	1.740
+++ openoffice.org.spec	22 Jun 2006 15:45:54 -0000	1.741
@@ -3312,6 +3312,7 @@
 %changelog
 * Thu Jun 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
 - next milestone
+- drop hack and use new gtk_print_unix_dialog_set_manual_capabilities api instead
 
 * Wed Jun 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.3
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses