rpms/openoffice.org/FC-6 openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch, NONE, 1.1 openoffice.org.spec, 1.914, 1.915

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

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/FC-6/openoffice.org.spec,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- openoffice.org.spec	5 Dec 2006 10:16:32 -0000	1.914
+++ openoffice.org.spec	12 Dec 2006 16:23:51 -0000	1.915
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.8
+%define rh_rpm_release 5.9
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -149,6 +149,7 @@
 Patch81: openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
 Patch82: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
 Patch83: openoffice.org-2.1.0.ooo70042.wmfoverflow.svtools.patch
+Patch84: openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1032,6 +1033,7 @@
 %patch81 -p1 -b .ooo71815.bridges.x86_64.patch
 %patch82 -p1 -b .rh217269.officecfg.nosequencecheck.patch
 %patch83 -p1 -b .ooo70042.wmfoverflow.svtools.patch
+%patch84 -p1 -b .ooo72505.vcl.wrongrole.patch
 
 tar xzf %{SOURCE1}
 
@@ -2557,6 +2559,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.0.4-5.5.9
+- Resolves: rhbz#219161 openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
+
 * Tue Dec 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.8
 - Resolves: rhbz#218412 crash on cancel from search view of file chooser