rpms/openoffice.org/devel openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch, NONE, 1.1 openoffice.org.spec, 1.1957, 1.1958

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21313

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch 
Log Message:
openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch

openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch:

--- NEW FILE openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch ---
diff -ru vcl.orig/inc/vcl/sndstyle.hxx vcl/inc/vcl/sndstyle.hxx
--- vcl.orig/inc/vcl/sndstyle.hxx	2009-07-02 10:10:49.000000000 +0100
+++ vcl/inc/vcl/sndstyle.hxx	2009-07-03 16:08:55.000000000 +0100
@@ -43,7 +43,6 @@
 #define SOUND_WARNING                   ((SoundType)2)
 #define SOUND_ERROR                     ((SoundType)3)
 #define SOUND_QUERY                     ((SoundType)4)
-
-#define SOUND_DISABLE                   (SOUND_DEFAULT)
+#define SOUND_DISABLE                   ((SoundType)5)
 
 #endif // _SV_SNDSTYLE_HXX
diff -ru vcl.orig/win/source/window/salframe.cxx vcl/win/source/window/salframe.cxx
--- vcl.orig/win/source/window/salframe.cxx	2009-07-02 10:10:22.000000000 +0100
+++ vcl/win/source/window/salframe.cxx	2009-07-03 16:10:27.000000000 +0100
@@ -3157,7 +3157,8 @@
         MB_ICONASTERISK,                // SOUND_INFO
         MB_ICONEXCLAMATION,             // SOUND_WARNING
         MB_ICONHAND,                    // SOUND_ERROR
-        MB_ICONQUESTION                 // SOUND_QUERY
+        MB_ICONQUESTION,                // SOUND_QUERY
+        0	                        // SOUND_DISABLE
     };
 
     MessageBeep( aImplSoundTab[eSoundType] );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -p -r1.1957 -r1.1958
--- openoffice.org.spec	3 Jul 2009 13:55:07 -0000	1.1957
+++ openoffice.org.spec	3 Jul 2009 15:38:27 -0000	1.1958
@@ -152,6 +152,7 @@ Patch74: workspace.aw073.patch
 Patch75: workspace.cmcfixes60.patch
 Patch76: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
 Patch77: openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch
+Patch78: openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1661,6 +1662,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch75 -p0 -b .workspace.cmcfixes60.patch
 %patch76 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
 %patch77 -p0 -b .ooo103145.vcl.kwinworkaround.patch
+%patch78 -p0 -b .ooo103319.vcl.canttakethebeeping.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4174,6 +4176,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Jul 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-15.2
+- add openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch
+
 * Fri Jul 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-15.1
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
 - next milestone