rpms/openoffice.org/devel openoffice.org.spec, 1.1239, 1.1240 workspace.unifysound01.patch, 1.1, 1.2 openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Aug 8 10:02:08 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30081
Modified Files:
openoffice.org.spec workspace.unifysound01.patch
Removed Files:
openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
Log Message:
drop annoying beeps, effectively merged into unifysound
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -r1.1239 -r1.1240
--- openoffice.org.spec 8 Aug 2007 09:41:32 -0000 1.1239
+++ openoffice.org.spec 8 Aug 2007 10:01:34 -0000 1.1240
@@ -92,66 +92,65 @@
Patch27: workspace.fpicker6.patch
Patch28: workspace.ppc64one.patch
Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch30: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch31: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch32: ooobuild.VBAObjects.patch
-Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch36: pseudoworkspace.valgrind1.patch
-Patch37: workspace.thbpp6.patch
-Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch41: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch42: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch43: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch44: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch45: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch46: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch47: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch48: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch50: workspace.tl37.patch
-Patch51: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch52: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch53: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch54: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch57: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch58: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch59: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch60: workspace.configrefactor01.patch
-Patch61: workspace.sixtyfour11.patch
-Patch62: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch63: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch64: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch65: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch66: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch67: openoffice.org-2.2.0.rh232389.tango.patch
-Patch68: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch69: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch70: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch71: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch73: workspace.cmcfixes34.patch
-Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
-Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
-Patch76: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch77: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch78: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
-Patch79: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
-Patch80: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
-Patch81: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch82: workspace.glyphadv.patch
-Patch83: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
-Patch84: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
-Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch88: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch89: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch90: workspace.unifysound01.patch
+Patch30: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch31: ooobuild.VBAObjects.patch
+Patch32: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch33: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch34: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch35: pseudoworkspace.valgrind1.patch
+Patch36: workspace.thbpp6.patch
+Patch37: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch38: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch39: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch40: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch41: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch42: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch43: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch44: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch45: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch46: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch47: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch48: workspace.tl37.patch
+Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch52: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch53: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch54: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch55: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch56: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch57: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch58: workspace.configrefactor01.patch
+Patch59: workspace.sixtyfour11.patch
+Patch60: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch61: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch62: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch63: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch64: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch65: openoffice.org-2.2.0.rh232389.tango.patch
+Patch66: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch67: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch68: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch69: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+Patch70: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch71: workspace.cmcfixes34.patch
+Patch72: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
+Patch73: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
+Patch74: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch75: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch76: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
+Patch77: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
+Patch78: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+Patch79: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch80: workspace.glyphadv.patch
+Patch81: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
+Patch82: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch83: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch84: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
+Patch85: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch86: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch87: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch88: workspace.unifysound01.patch
%define instdir %{_libdir}/openoffice.org
@@ -1034,70 +1033,69 @@
%patch27 -p1 -b .workspace.fpicker6.patch
%patch28 -p1 -b .workspace.ppc64one.patch
%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch30 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch31 -p1 -b .rh187919.gtkunderkde.patch
-%patch32 -p0 -b .ooobuild.VBAObjects.patch
-%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch37 -p1 -b .workspace.thbpp6.patch
-%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch39 -p1 -b .rh217065.syncbackspace.patch
-%patch40 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch41 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch42 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch43 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH44} >> svtools/source/dialogs/localize.sdf
-%patch45 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch46 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch47 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch48 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch50 -p1 -b .tl37.patch
-%patch51 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch52 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch53 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch54 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch57 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch58 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch59 -p1 -b .ooo74401.basctl.boost.patch
-%patch60 -p1 -b .workspace.configrefactor01.patch
-%patch61 -p1 -b .workspace.sixtyfour11.patch
-%patch62 -p1 -b .ooo68717.gstreamer.video.patch
-%patch63 -p1 -b .ooo63159.sal.dtype.patch
-%patch64 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch65 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch66 -p1 -b .ooo75329.xdguserdir.patch
-%patch67 -p1 -b .rh232389.tango.patch
+%patch30 -p1 -b .rh187919.gtkunderkde.patch
+%patch31 -p0 -b .ooobuild.VBAObjects.patch
+%patch32 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch33 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch34 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch35 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch36 -p1 -b .workspace.thbpp6.patch
+%patch37 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch38 -p1 -b .rh217065.syncbackspace.patch
+%patch39 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch40 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch41 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch42 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH43} >> svtools/source/dialogs/localize.sdf
+%patch44 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch45 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch46 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch47 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch48 -p1 -b .tl37.patch
+%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch50 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch52 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch53 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch54 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch55 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch56 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch57 -p1 -b .ooo74401.basctl.boost.patch
+%patch58 -p1 -b .workspace.configrefactor01.patch
+%patch59 -p1 -b .workspace.sixtyfour11.patch
+%patch60 -p1 -b .ooo68717.gstreamer.video.patch
+%patch61 -p1 -b .ooo63159.sal.dtype.patch
+%patch62 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch63 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch64 -p1 -b .ooo75329.xdguserdir.patch
+%patch65 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch68 -p1 -b .ooo53397.linkopt.patch
+%patch65 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch69 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch70 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch71 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch73 -p1 -b .workspace.cmcfixes34.patch
-%patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
-%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
+%patch67 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch68 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch69 -p1 -b .oooXXXXX.shell.reduceglobals.patch
+%patch70 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch71 -p1 -b .workspace.cmcfixes34.patch
+%patch72 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
+%patch73 -p1 -b .ooo73728.desktop.mapped_type.patch
%if %{linkopt}
-%patch76 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch74 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch77 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch78 -p1 -b .ooo78198.sixtyfour.svx.patch
-%patch79 -p1 -b .ooo78383.vcl.printxerror.patch
-%patch80 -p1 -b .ooo78392.sixtyfour.tools.patch
-%patch81 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch82 -p1 -b .workspace.glyphadv.patch
-%patch83 -p1 -b .ooo78921.sw.embedded.patch
-%patch84 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch85 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
-%patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch88 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH89}
-%patch90 -p1 -b .workspace.unifysound01.patch
+%patch75 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch76 -p1 -b .ooo78198.sixtyfour.svx.patch
+%patch77 -p1 -b .ooo78383.vcl.printxerror.patch
+%patch78 -p1 -b .ooo78392.sixtyfour.tools.patch
+%patch79 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch80 -p1 -b .workspace.glyphadv.patch
+%patch81 -p1 -b .ooo78921.sw.embedded.patch
+%patch82 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch83 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch84 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
+%patch85 -p1 -b .ooo79878.vcl.honourwidthtype.patch
+%patch86 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH87}
+%patch88 -p1 -b .workspace.unifysound01.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2700,6 +2698,7 @@
+ unify all our sound under gstreamer
+ add play button to sound selection fpicker
+ fix type detection for .wavs so they don't open as text files(!)
+ + drop openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
* Tue Jul 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.7
- Resolves: ooo#79953 inhibit screensaver during presentations
workspace.unifysound01.patch:
Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.unifysound01.patch 8 Aug 2007 09:39:39 -0000 1.1
+++ workspace.unifysound01.patch 8 Aug 2007 10:01:34 -0000 1.2
@@ -1775,3 +1775,850 @@
// #105638# OJ
aTmp <<= sal_True;
xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp );
+Index: inc/vcl/salinst.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/vcl/salinst.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 salinst.hxx
+--- openoffice.org.orig/vcl/inc/vcl/salinst.hxx 11 Apr 2007 18:07:19 -0000 1.2
++++ openoffice.org/vcl/inc/vcl/salinst.hxx 8 Aug 2007 09:48:33 -0000
+@@ -60,7 +60,6 @@
+ class SalGraphics;
+ class SalFrame;
+ class SalObject;
+-class SalSound;
+ class SalOpenGL;
+ class SalMenu;
+ class SalMenuItem;
+@@ -136,8 +135,6 @@
+ virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
+ virtual String GetDefaultPrinter() = 0;
+
+- // SalSound
+- virtual SalSound* CreateSalSound() = 0;
+ // SalTimer
+ virtual SalTimer* CreateSalTimer() = 0;
+ // SalOpenGL
+Index: inc/vcl/settings.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/vcl/settings.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 settings.hxx
+--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 4 Jun 2007 14:57:34 -0000 1.3
++++ openoffice.org/vcl/inc/vcl/settings.hxx 8 Aug 2007 09:48:36 -0000
+@@ -1019,55 +1019,6 @@
+ { return !(*this == rSet); }
+ };
+
+-// -----------------
+-// - ImplSoundData -
+-// -----------------
+-
+-class ImplSoundData
+-{
+- friend class SoundSettings;
+-
+- ImplSoundData();
+- ImplSoundData( const ImplSoundData& rData );
+-
+-private:
+- ULONG mnRefCount;
+- ULONG mnOptions;
+-};
+-
+-// -----------------
+-// - SoundSettings -
+-// -----------------
+-
+-#define SOUND_OPTION_ON ((ULONG)0x00000001)
+-#define SOUND_OPTION_NOTIFYBEEP ((ULONG)0x00000002)
+-#define SOUND_OPTION_WARNINGBEEP ((ULONG)0x00000004)
+-#define SOUND_OPTION_ERRORBEEP ((ULONG)0x00000008)
+-
+-class VCL_DLLPUBLIC SoundSettings
+-{
+- void CopyData();
+-
+-private:
+- ImplSoundData* mpData;
+-
+-public:
+- SoundSettings();
+- SoundSettings( const SoundSettings& rSet );
+- ~SoundSettings();
+-
+- void SetOptions( ULONG nOptions )
+- { CopyData(); mpData->mnOptions = nOptions; }
+- ULONG GetOptions() const
+- { return mpData->mnOptions; }
+-
+- const SoundSettings& operator =( const SoundSettings& rSet );
+-
+- BOOL operator ==( const SoundSettings& rSet ) const;
+- BOOL operator !=( const SoundSettings& rSet ) const
+- { return !(*this == rSet); }
+-};
+-
+ // ------------------------
+ // - ImplNotificationData -
+ // ------------------------
+@@ -1193,7 +1144,6 @@
+ KeyboardSettings maKeyboardSettings;
+ StyleSettings maStyleSettings;
+ MiscSettings maMiscSettings;
+- SoundSettings maSoundSettings;
+ NotificationSettings maNotificationSettings;
+ HelpSettings maHelpSettings;
+ ::com::sun::star::lang::Locale maLocale;
+@@ -1272,11 +1222,6 @@
+ const MiscSettings& GetMiscSettings() const
+ { return mpData->maMiscSettings; }
+
+- void SetSoundSettings( const SoundSettings& rSet )
+- { CopyData(); mpData->maSoundSettings = rSet; }
+- const SoundSettings& GetSoundSettings() const
+- { return mpData->maSoundSettings; }
+-
+ void SetNotificationSettings( const NotificationSettings& rSet )
+ { CopyData(); mpData->maNotificationSettings = rSet; }
+ const NotificationSettings& GetNotificationSettings() const
+Index: inc/vcl/sound.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/vcl/sound.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 sound.hxx
+--- openoffice.org.orig/vcl/inc/vcl/sound.hxx 11 Apr 2007 18:11:10 -0000 1.2
++++ openoffice.org/vcl/inc/vcl/sound.hxx 8 Aug 2007 09:48:36 -0000
+@@ -53,14 +53,9 @@
+ #ifndef _TIME_HXX
+ #include <tools/time.hxx>
+ #endif
+-#ifndef _SV_SALSTYPE_HXX
+-#include <vcl/salstype.hxx>
+-#endif
+
+ class Window;
+ class Timer;
+-class SalSound;
+-class RMSound;
+
+ // ---------
+ // - Sound -
+@@ -68,70 +63,8 @@
+
+ class VCL_DLLPUBLIC Sound
+ {
+-private:
+-
+- SalSound* mpSound;
+- XubString maSoundName;
+- Window* mpWindow;
+- BYTE* mpSoundData_NOTUSED;
+- ULONG mnDataLen;
+- ULONG mnSoundLen;
+- ULONG mnStartTime;
+- ULONG mnPlayTime;
+- ULONG mnErrorCode;
+- SoundNotification meNotification;
+- BOOL mbPlaying;
+- BOOL mbLoopMode;
+- Link maNotifyHdl;
+- void* mpExtraData;
+-
+-private:
+-
+- Sound( const Sound& rSound );
+- Sound& operator=( const Sound& rSound );
+-
+-//#if 0 // _SOLAR__PRIVATE
+ public:
+- SAL_DLLPRIVATE void ImplNotify( SoundNotification eNotification, ULONG nError );
+-//#endif // __PRIVATE
+-
+-public:
+- Sound( Window* pWindow = NULL );
+- virtual ~Sound();
+-
+- virtual void Notify();
+-
+- void SetWindow( Window* pWindow ) { mpWindow = pWindow; }
+- Window* GetWindow() const { return mpWindow; }
+- BOOL SetSoundName( const XubString& rSoundName );
+- const XubString& GetSoundName() const { return maSoundName; }
+- ULONG GetSoundLen() const { return mnSoundLen; }
+-
+- void Play();
+- void Stop();
+- void Pause();
+- BOOL IsPlaying() const { return mbPlaying; }
+-
+- void SetStartTime( ULONG nStartTime = 0 );
+- ULONG GetStartTime() const { return mnStartTime; }
+- void SetPlayTime( ULONG nPlayTime = SOUND_PLAYALL );
+- ULONG GetPlayTime() const { return mnPlayTime; }
+- void SetLoopMode( BOOL bLoop );
+- BOOL IsLoopMode() const { return mbLoopMode; }
+-
+- void ClearError();
+- ULONG GetLastError() const { return mnErrorCode; }
+- SoundNotification GetNotification() const { return meNotification; }
+-
+- void SetNotifyHdl( const Link& rLink ) { maNotifyHdl = rLink; }
+- const Link& GetNotifyHdl() const { return maNotifyHdl; }
+-
+ static void Beep( SoundType eType = SOUND_DEFAULT, Window* pWindow = NULL );
+-
+- static void SetSoundPath( const XubString& rSoundPath );
+- static const XubString& GetSoundPath();
+-
+- static BOOL IsSoundFile( const XubString& rSoundPath );
+ };
+
+ #endif // _SV_SOUND_HXX
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/gsl/vcl/prj/build.lst,v
+retrieving revision 1.54
+diff -u -r1.54 build.lst
+--- openoffice.org.orig/vcl/prj/build.lst 24 Jul 2007 10:40:56 -0000 1.54
++++ openoffice.org/vcl/prj/build.lst 8 Aug 2007 09:48:41 -0000
+@@ -1,4 +1,4 @@
+-vc vcl : BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
++vc vcl : BOOST:boost FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp transex3 NULL
+ vc vcl usr1 - all vc_mkout NULL
+ vc vcl\inc nmake - all vc_inc NULL
+ vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL
+Index: source/app/salvtables.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/app/salvtables.cxx,v
+retrieving revision 1.8
+diff -u -r1.8 salvtables.cxx
+--- openoffice.org.orig/vcl/source/app/salvtables.cxx 24 Jul 2007 10:04:17 -0000 1.8
++++ openoffice.org/vcl/source/app/salvtables.cxx 8 Aug 2007 09:48:45 -0000
+@@ -41,7 +41,6 @@
+ #include <vcl/salvd.hxx>
+ #include <vcl/salprn.hxx>
+ #include <vcl/saltimer.hxx>
+-#include <vcl/salsound.hxx>
+ #include <vcl/salogl.hxx>
+ #include <vcl/salimestatus.hxx>
+ #include <vcl/salsys.hxx>
+@@ -61,10 +60,6 @@
+ {
+ }
+
+-SalSound::~SalSound()
+-{
+-}
+-
+ SalTimer::~SalTimer()
+ {
+ }
+Index: source/app/settings.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/app/settings.cxx,v
+retrieving revision 1.72
+diff -u -r1.72 settings.cxx
+--- openoffice.org.orig/vcl/source/app/settings.cxx 24 Jul 2007 10:04:42 -0000 1.72
++++ openoffice.org/vcl/source/app/settings.cxx 8 Aug 2007 09:48:46 -0000
+@@ -1311,98 +1311,6 @@
+ return mpData->mbEnableLocalizedDecimalSep;
+ }
+
+-
+-
+-// =======================================================================
+-
+-ImplSoundData::ImplSoundData()
+-{
+- mnRefCount = 1;
+- mnOptions = 0;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-ImplSoundData::ImplSoundData( const ImplSoundData& rData )
+-{
+- mnRefCount = 1;
+- mnOptions = rData.mnOptions;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-SoundSettings::SoundSettings()
+-{
+- mpData = new ImplSoundData();
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-SoundSettings::SoundSettings( const SoundSettings& rSet )
+-{
+- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "SoundSettings: RefCount overflow" );
+-
+- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
+- mpData = rSet.mpData;
+- mpData->mnRefCount++;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-SoundSettings::~SoundSettings()
+-{
+- // Daten loeschen, wenn letzte Referenz
+- if ( mpData->mnRefCount == 1 )
+- delete mpData;
+- else
+- mpData->mnRefCount--;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-const SoundSettings& SoundSettings::operator =( const SoundSettings& rSet )
+-{
+- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "SoundSettings: RefCount overflow" );
+-
+- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+- rSet.mpData->mnRefCount++;
+-
+- // Daten loeschen, wenn letzte Referenz
+- if ( mpData->mnRefCount == 1 )
+- delete mpData;
+- else
+- mpData->mnRefCount--;
+-
+- mpData = rSet.mpData;
+-
+- return *this;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void SoundSettings::CopyData()
+-{
+- // Falls noch andere Referenzen bestehen, dann kopieren
+- if ( mpData->mnRefCount != 1 )
+- {
+- mpData->mnRefCount--;
+- mpData = new ImplSoundData( *mpData );
+- }
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-BOOL SoundSettings::operator ==( const SoundSettings& rSet ) const
+-{
+- if ( mpData == rSet.mpData )
+- return TRUE;
+-
+- if ( (mpData->mnOptions == rSet.mpData->mnOptions) )
+- return TRUE;
+- else
+- return FALSE;
+-}
+-
+ // =======================================================================
+
+ ImplNotificationData::ImplNotificationData()
+@@ -1625,7 +1533,6 @@
+ maKeyboardSettings( rData.maKeyboardSettings ),
+ maStyleSettings( rData.maStyleSettings ),
+ maMiscSettings( rData.maMiscSettings ),
+- maSoundSettings( rData.maSoundSettings ),
+ maNotificationSettings( rData.maNotificationSettings ),
+ maHelpSettings( rData.maHelpSettings ),
+ maLocale( rData.maLocale ),
+@@ -1795,16 +1702,6 @@
+ }
+ }
+
+- if ( nFlags & SETTINGS_SOUND )
+- {
+- if ( mpData->maSoundSettings != rSet.mpData->maSoundSettings )
+- {
+- CopyData();
+- mpData->maSoundSettings = rSet.mpData->maSoundSettings;
+- nChangeFlags |= SETTINGS_SOUND;
+- }
+- }
+-
+ if ( nFlags & SETTINGS_NOTIFICATION )
+ {
+ if ( mpData->maNotificationSettings != rSet.mpData->maNotificationSettings )
+@@ -1876,9 +1773,6 @@
+ if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings )
+ nChangeFlags |= SETTINGS_MISC;
+
+- if ( mpData->maSoundSettings != rSet.mpData->maSoundSettings )
+- nChangeFlags |= SETTINGS_SOUND;
+-
+ if ( mpData->maNotificationSettings != rSet.mpData->maNotificationSettings )
+ nChangeFlags |= SETTINGS_NOTIFICATION;
+
+@@ -1909,7 +1803,6 @@
+ (mpData->maKeyboardSettings == rSet.mpData->maKeyboardSettings) &&
+ (mpData->maStyleSettings == rSet.mpData->maStyleSettings) &&
+ (mpData->maMiscSettings == rSet.mpData->maMiscSettings) &&
+- (mpData->maSoundSettings == rSet.mpData->maSoundSettings) &&
+ (mpData->maNotificationSettings == rSet.mpData->maNotificationSettings) &&
+ (mpData->maHelpSettings == rSet.mpData->maHelpSettings) &&
+ (mpData->mnSystemUpdate == rSet.mpData->mnSystemUpdate) &&
+Index: source/app/sound.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/app/sound.cxx,v
+retrieving revision 1.14
+diff -u -r1.14 sound.cxx
+--- openoffice.org.orig/vcl/source/app/sound.cxx 27 Jun 2007 20:02:09 -0000 1.14
++++ openoffice.org/vcl/source/app/sound.cxx 8 Aug 2007 09:48:46 -0000
+@@ -48,9 +48,6 @@
+ #ifndef _SV_SVSYS_HXX
+ #include <svsys.h>
+ #endif
+-#ifndef _SV_SALSOUND_HXX
+-#include <vcl/salsound.hxx>
+-#endif
+ #ifndef _SV_SALFRAME_HXX
+ #include <vcl/salframe.hxx>
+ #endif
+@@ -63,9 +60,6 @@
+ #ifndef _SV_WINDOW_HXX
+ #include <vcl/window.hxx>
+ #endif
+-#ifndef _SV_SALSOUND_HXX
+-#include <vcl/salsound.hxx>
+-#endif
+ #ifndef _SV_SALBTYPE_HXX
+ #include <vcl/salbtype.hxx>
+ #endif
+@@ -76,194 +70,6 @@
+ #include <vcl/salinst.hxx>
+ #endif
+
+-
+-
+-// ----------------------
+-// - SalSound-Callback -
+-// ----------------------
+-
+-void SalSoundProc( void* pInst, SoundNotification eNotification, ULONG nError )
+-{
+- ( (Sound*) pInst )->ImplNotify( eNotification, nError );
+-}
+-
+-// ---------
+-// - Sound -
+-// ---------
+-
+-Sound::Sound( Window* pWindow ) :
+- mpWindow ( pWindow ),
+- mnDataLen ( 0UL ),
+- mnSoundLen ( 0UL ),
+- mnStartTime ( 0UL ),
+- mnPlayTime ( SOUND_PLAYALL ),
+- mnErrorCode ( 0UL ),
+- meNotification ( SOUND_NOTIFY_SUCCESS ),
+- mbPlaying ( FALSE ),
+- mbLoopMode ( FALSE )
+-{
+- mpSound = ImplGetSVData()->mpDefInst->CreateSalSound();
+-
+- if( mpSound->IsValid() )
+- mpSound->SetNotifyProc( this, SalSoundProc );
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-Sound::~Sound()
+-{
+- delete mpSound;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::ImplNotify( SoundNotification eNotification, ULONG nError )
+-{
+- meNotification = eNotification;
+- mbPlaying = FALSE;
+-
+- if( SOUND_NOTIFY_ERROR == meNotification )
+- mnErrorCode = nError;
+-
+- Notify();
+-
+- if( maNotifyHdl.IsSet() )
+- maNotifyHdl.Call( this );
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::Notify()
+-{
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-BOOL Sound::SetSoundName( const XubString& rSoundName )
+-{
+- BOOL bRet( FALSE );
+-
+- if( !rSoundName.Len() )
+- {
+- mnDataLen = 0UL;
+- mnSoundLen = 0UL;
+- mnStartTime = 0UL;
+- mnPlayTime = SOUND_PLAYALL;
+- mnErrorCode = 0UL;
+- meNotification = SOUND_NOTIFY_SUCCESS;
+- mbPlaying = FALSE;
+- mbLoopMode = FALSE;
+- bRet = TRUE;
+-
+- mpSound->Init( rSoundName, mnSoundLen );
+- }
+- else if( mpSound->IsValid() )
+- {
+- INetURLObject aSoundURL( rSoundName );
+- String aSoundName, aTmp;
+- BOOL bValidName( FALSE );
+-
+- // #106654# Accept only local sound files
+- if( aSoundURL.GetProtocol() == INET_PROT_FILE )
+- {
+- utl::LocalFileHelper::ConvertURLToPhysicalName( aSoundURL.GetMainURL( INetURLObject::NO_DECODE ), aSoundName );
+- bValidName = TRUE;
+- }
+- else if( aSoundURL.GetProtocol() == INET_PROT_NOT_VALID &&
+- ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rSoundName, aTmp ) )
+- {
+- aSoundName = rSoundName;
+- bValidName = TRUE;
+- }
+- else
+- {
+- // no valid sound file name
+- aSoundName = String();
+-
+- // #106654# Don't set bRet to true for invalid sound file
+- // names, but init with empty string, anyway
+- mpSound->Init( aSoundName, mnSoundLen );
+- }
+-
+- if( bValidName )
+- bRet = mpSound->Init( aSoundName, mnSoundLen );
+- }
+-
+- maSoundName = rSoundName;
+-
+- // if sound could not be initialized, but we've gotten _no_
+- // notification ==> create common error notification
+- if( !bRet && !mnErrorCode )
+- ImplNotify( SOUND_NOTIFY_ERROR, SOUNDERR_GENERAL_ERROR );
+-
+- return bRet;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::SetStartTime( ULONG nStartTime )
+-{
+- mnStartTime = nStartTime;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::SetPlayTime( ULONG nPlayTime )
+-{
+- mnPlayTime = nPlayTime;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::SetLoopMode( BOOL bLoop )
+-{
+- mbLoopMode = bLoop;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::ClearError()
+-{
+- mnErrorCode = 0;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::Play()
+-{
+- BOOL bRet;
+-
+- if( mpSound->IsValid() && !mnErrorCode )
+- {
+- mpSound->Play( mnStartTime, mnPlayTime, mbLoopMode );
+- mbPlaying = TRUE;
+- }
+- else
+- bRet = FALSE;
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::Stop()
+-{
+- mbPlaying = FALSE;
+-
+- if( mpSound->IsValid() )
+- mpSound->Stop();
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::Pause()
+-{
+- mbPlaying = FALSE;
+-
+- if( mpSound->IsValid() )
+- mpSound->Pause();
+-}
+-
+-// -----------------------------------------------------------------------
+-
+ void Sound::Beep( SoundType eType, Window* pWindow )
+ {
+ if( !pWindow )
+@@ -274,62 +80,3 @@
+ else
+ pWindow->ImplGetFrame()->Beep( eType );
+ }
+-
+-// -----------------------------------------------------------------------
+-
+-void Sound::SetSoundPath( const XubString& )
+-{
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-const XubString& Sound::GetSoundPath()
+-{
+- return ImplGetSVEmptyStr();
+-}
+-
+-// -----------------------------------------------------------------------
+-
+-BOOL Sound::IsSoundFile( const XubString& rSoundPath )
+-{
+- BOOL bRet = FALSE;
+-
+- if( rSoundPath.Len() )
+- {
+- INetURLObject aSoundURL( rSoundPath );
+- String aSoundName;
+-
+- if( aSoundURL.GetProtocol() != INET_PROT_NOT_VALID )
+- aSoundName = aSoundURL.GetMainURL( INetURLObject::NO_DECODE );
+- else if( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rSoundPath, aSoundName ) )
+- aSoundName.Erase();
+-
+- if( aSoundName.Len() )
+- {
+- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aSoundName, STREAM_READ );
+-
+- if( pIStm )
+- {
+- sal_Char aData[ 12 ];
+-
+- if( ( pIStm->Read( aData, 12 ) == 12 ) && !pIStm->GetError() )
+- {
+- // check for WAV
+- bRet = ( aData[ 0 ] == 'R' && aData[ 1 ] == 'I' && aData[ 2 ] == 'F' && aData[ 3 ] == 'F' &&
+- aData[ 8 ] == 'W' && aData[ 9 ] == 'A' && aData[ 10 ] == 'V' && aData[ 11 ] == 'E' );
+- }
+-
+- delete pIStm;
+- }
+-
+- if( !bRet )
+- {
+- // check it the hard way
+- Sound aTestSound;
+- bRet = aTestSound.SetSoundName( rSoundPath );
+- }
+- }
+- }
+-
+- return bRet;
+-}
+Index: source/app/svmain.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/app/svmain.cxx,v
+retrieving revision 1.70
+diff -u -r1.70 svmain.cxx
+--- openoffice.org.orig/vcl/source/app/svmain.cxx 24 Jul 2007 10:05:33 -0000 1.70
++++ openoffice.org/vcl/source/app/svmain.cxx 8 Aug 2007 09:48:48 -0000
+@@ -57,9 +57,6 @@
+ #ifndef _SV_SALINST_HXX
+ #include <vcl/salinst.hxx>
+ #endif
+-#ifndef _SV_SALSOUND_HXX
+-#include <vcl/salsound.hxx>
+-#endif
+ #ifndef _SV_SALOGL_HXX
+ #include <vcl/salogl.hxx>
+ #endif
+Index: unx/gtk/window/gtkframe.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
+retrieving revision 1.65
+diff -u -r1.65 gtkframe.cxx
+--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 24 Jul 2007 10:25:16 -0000 1.65
++++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 8 Aug 2007 09:50:35 -0000
+@@ -1911,9 +1911,17 @@
+ ReleaseGraphics( pGraphics );
+ }
+
+-void GtkSalFrame::Beep( SoundType /*eType*/ )
++void GtkSalFrame::Beep( SoundType eType )
+ {
+- gdk_display_beep( getGdkDisplay() );
++ switch( eType )
++ {
++ case SOUND_DEFAULT:
++ case SOUND_ERROR:
++ gdk_display_beep( getGdkDisplay() );
++ break;
++ default:
++ break;
++ }
+ }
+
+ const SystemEnvData* GtkSalFrame::GetSystemData() const
+Index: unx/inc/postx.h
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/inc/postx.h,v
+retrieving revision 1.5
+diff -u -r1.5 postx.h
+--- openoffice.org.orig/vcl/unx/inc/postx.h 19 Jun 2006 19:46:31 -0000 1.5
++++ openoffice.org/vcl/unx/inc/postx.h 8 Aug 2007 09:50:39 -0000
+@@ -69,9 +69,6 @@
+ #undef InitializeToken
+ #undef NextRequest
+
+-/* Network Audio System */
+-#undef Sound
+-
+ #ifdef KeyPress
+ #if KeyPress != 2
+ Error KeyPress must be Equal 2
+Index: unx/inc/prex.h
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/inc/prex.h,v
+retrieving revision 1.15
+diff -u -r1.15 prex.h
+--- openoffice.org.orig/vcl/unx/inc/prex.h 26 Apr 2007 10:40:23 -0000 1.15
++++ openoffice.org/vcl/unx/inc/prex.h 8 Aug 2007 09:50:39 -0000
+@@ -51,9 +51,6 @@
+ #define Region XLIB_Region
+ #define Boolean XLIB_Boolean
+
+-/* fuer Network Audio System */
+-#define Sound XLIB_Sound
+-
+ #if defined __cplusplus
+ extern "C" {
+ #endif
+Index: unx/inc/salinst.h
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/inc/salinst.h,v
+retrieving revision 1.14
+diff -u -r1.14 salinst.h
+--- openoffice.org.orig/vcl/unx/inc/salinst.h 27 Jun 2007 20:41:36 -0000 1.14
++++ openoffice.org/vcl/unx/inc/salinst.h 8 Aug 2007 09:50:40 -0000
+@@ -108,7 +108,6 @@
+ virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+ virtual String GetDefaultPrinter();
+
+- virtual SalSound* CreateSalSound();
+ virtual SalTimer* CreateSalTimer();
+ virtual SalOpenGL* CreateSalOpenGL( SalGraphics* pGraphics );
+ virtual SalI18NImeStatus* CreateI18NImeStatus();
+Index: unx/source/app/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
+retrieving revision 1.27
+diff -u -r1.27 makefile.mk
+--- openoffice.org.orig/vcl/unx/source/app/makefile.mk 6 Feb 2007 14:19:12 -0000 1.27
++++ openoffice.org/vcl/unx/source/app/makefile.mk 8 Aug 2007 09:50:45 -0000
+@@ -69,13 +69,7 @@
+ $(SLO)$/soicon.obj \
+ $(SLO)$/sm.obj \
+ $(SLO)$/keysymnames.obj \
+- $(SLO)$/wmadaptor.obj \
+- $(SLO)$/salsound2.obj \
+- $(SLO)$/osssound.obj \
+- $(SLO)$/devaudiosound.obj \
+- $(SLO)$/audioconvert.obj \
+- $(SLO)$/rptpsound.obj \
+- $(SLO)$/nassound.obj
++ $(SLO)$/wmadaptor.obj
+
+ EXCEPTIONSFILES=\
+ $(SLO)$/wmadaptor.obj \
+@@ -87,21 +81,6 @@
+ $(SLO)$/salsys.obj
+
+
+-.IF "$(ENABLE_NAS)" != ""
+-CDEFS+=-DUSE_NAS
+-.ENDIF
+-
+-.IF "$(ENABLE_PASF)" != ""
+-CDEFS+=-DUSE_PASF
+-SLOFILES+=$(SLO)$/pasfsound.obj
+-.IF "$(SYSTEM_SNDFILE)" == "YES"
+-CDEFS+=-DSYSTEM_SNDFILE
+-.ENDIF
+-.IF "$(SYSTEM_PORTAUDIO)" == "YES"
+-CDEFS+=-DSYSTEM_PORTAUDIO
+-.ENDIF
+-.ENDIF
+-
+ .IF "$(WITH_LIBSN)"=="YES"
+ CDEFS+=-DHAVE_LIBSN
+ CFLAGS+=$(LIBSN_CFLAGS)
+Index: unx/source/app/salinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/salinst.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 salinst.cxx
+--- openoffice.org.orig/vcl/unx/source/app/salinst.cxx 27 Jun 2007 20:47:09 -0000 1.32
++++ openoffice.org/vcl/unx/source/app/salinst.cxx 8 Aug 2007 09:50:48 -0000
+@@ -75,9 +75,6 @@
+ #ifndef _SV_SALOGL_H
+ #include <salogl.h>
+ #endif
+-#ifndef _SV_SALSOUND_H
+-#include <salsound.h>
+-#endif
+
+ // -------------------------------------------------------------------------
+ //
+@@ -145,9 +142,6 @@
+
+ X11SalInstance::~X11SalInstance()
+ {
+- // deinitialize global sound resources
+- X11SalSound::Release();
+-
+ // release (possibly open) OpenGL context
+ X11SalOpenGL::Release();
+
+@@ -323,9 +317,3 @@
+ {
+ return new X11SalOpenGL( pGraphics );
+ }
+-
+-SalSound* X11SalInstance::CreateSalSound()
+-{
+- return new X11SalSound();
+-}
+-
--- openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch DELETED ---
More information about the fedora-extras-commits
mailing list