rpms/openoffice.org/devel openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch, NONE, 1.1 openoffice.org.spec, 1.974, 1.975

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch 
Log Message:
openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch

openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch:
 source/window/window.cxx     |    0 
 vcl/source/window/window.cxx |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.246
diff -u -r1.246 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx	13 Oct 2006 08:32:58 -0000	1.246
+++ openoffice.org/vcl/source/window/window.cxx	12 Dec 2006 16:13:26 -0000
@@ -1230,7 +1245,7 @@
 
     char* pRes = (char*)GetClassRes();
     pRes += 8;
-    ULONG nStyle = GetLongRes( (void*)pRes );
+    sal_uInt32 nStyle = (sal_uInt32)GetLongRes( (void*)pRes );
     ((ResId&)rResId).aWinBits = nStyle;
     return nStyle;
 }
@@ -1242,7 +1257,7 @@
     // newer move this line after IncrementRes
     char* pRes = (char*)GetClassRes();
     pRes += 12;
-    ULONG nHelpId = (ULONG)GetLongRes( (void*)pRes );
+    sal_uInt32 nHelpId = (sal_uInt32)GetLongRes( (void*)pRes );
     if ( !nHelpId )
         nHelpId = ImplAutoHelpID();
     SetHelpId( nHelpId );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -r1.974 -r1.975
--- openoffice.org.spec	7 Dec 2006 21:07:22 -0000	1.974
+++ openoffice.org.spec	12 Dec 2006 16:21:52 -0000	1.975
@@ -1,6 +1,6 @@
 %define oootag OOE680
 %define ooomilestone 6
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -139,6 +139,7 @@
 Patch71: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
 Patch72: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
 Patch73: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch74: openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -1014,6 +1015,7 @@
 %patch71 -p1 -b .rh217269.officecfg.nosequencecheck.patch
 %patch72 -p1 -b .ooo72129.vcl.fontglyphindex.patch
 %patch73 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch74 -p1 -b .ooo72505.vcl.wrongrole.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -2624,6 +2626,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Dec 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.6
+- Resolves: rhbz#219161 openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 1:2.1.0-6.5
 - rebuild for python2.5