rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.30, 1.31 openoffice.org.spec, 1.1170, 1.1171

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#203495

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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	1 May 2007 16:31:47 -0000	1.30
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	4 May 2007 14:23:08 -0000	1.31
@@ -466,6 +466,15 @@
  
  	SVT_DLLPRIVATE void				ImplCheckOK();
  	SVT_DLLPRIVATE void				ImplInitControls();
+@@ -211,6 +214,8 @@
+ 	virtual short		Execute();
+ 
+ 	void				DisableHelp();
++
++    virtual unsigned long GetNativeHandle() const;
+ };
+ 
+ 
 Index: source/dialogs/printdlg.cxx
 ===================================================================
 RCS file: /cvs/util/svtools/source/dialogs/printdlg.cxx,v
@@ -548,10 +557,15 @@
  {
  	FreeResource();
  
-@@ -608,6 +656,241 @@
+@@ -608,6 +656,246 @@
  
  // -----------------------------------------------------------------------
  
++unsigned long PrintDialog::GetNativeHandle() const
++{
++    return !mnNativeHandle ? Window::GetNativeHandle() : mnNativeHandle;
++}
++
 +#define ASCII_STR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))
 +
 +static void setcupskey(const gchar *key, const gchar *value, gpointer user_data)
@@ -1244,8 +1258,8 @@
      */
      void doLazyDelete();
 +
-+    unsigned long GetNativeHandle() const;
-+    void SetNativeParent(unsigned long nParent);
++    virtual unsigned long GetNativeHandle() const;
++    virtual void SetNativeParent(unsigned long nParent);
  };
  
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1170
retrieving revision 1.1171
diff -u -r1.1170 -r1.1171
--- openoffice.org.spec	3 May 2007 18:54:38 -0000	1.1170
+++ openoffice.org.spec	4 May 2007 14:23:08 -0000	1.1171
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2634,9 +2634,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Apr 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.7
+* Fri May 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.8
 - Resolves: rhbz#203495 add some magic to allow native and OOo dialogs to
   interleave and keep parent child transient logic correct
+
+* Tue Apr 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.7
 - remove gnome icons seeing as they are redundant
 - Resolves: rhbz#231924 Add the hunspell dictionaries requires
 - Resolves: rhbz#231924 add remove NatNum1 from bn_IN.xml