rpms/openoffice.org/devel workspace.unifysound01.patch,1.3,1.4

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	workspace.unifysound01.patch 
Log Message:
more backporting

workspace.unifysound01.patch:

Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.unifysound01.patch	8 Aug 2007 10:56:27 -0000	1.3
+++ workspace.unifysound01.patch	8 Aug 2007 13:24:26 -0000	1.4
@@ -2583,3 +2583,26 @@
 -    return new X11SalSound();
 -}
 -
+diff -ru vcl.orig/unx/dummy/dinst.cxx vcl/unx/dummy/dinst.cxx
+--- openoffice.org.orig/vcl/unx/dummy/dinst.cxx	2007-08-08 14:51:13.000000000 +0100
++++ openoffice.org/vcl/unx/dummy/dinst.cxx	2007-08-08 14:51:27.000000000 +0100
+@@ -66,7 +66,6 @@
+     virtual void				DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+     virtual String             GetDefaultPrinter();
+ 
+-    virtual SalSound*			CreateSalSound();
+     virtual SalTimer*			CreateSalTimer();
+     virtual SalOpenGL*			CreateSalOpenGL( SalGraphics* pGraphics );
+     virtual SalI18NImeStatus*	CreateI18NImeStatus();
+@@ -168,11 +167,6 @@
+     return String();
+ }
+ 
+-SalSound*			DummyInstance::CreateSalSound()
+-{
+-    return NULL;
+-}
+-
+ SalTimer*			DummyInstance::CreateSalTimer()
+ {
+     return NULL;