rpms/openoffice.org/devel workspace.unifysound01.patch,1.5,1.6

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	workspace.unifysound01.patch 
Log Message:
forgot svx bit

workspace.unifysound01.patch:

Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.unifysound01.patch	8 Aug 2007 21:49:42 -0000	1.5
+++ workspace.unifysound01.patch	9 Aug 2007 07:39:53 -0000	1.6
@@ -2606,3 +2606,62 @@
  SalTimer*			DummyInstance::CreateSalTimer()
  {
      return NULL;
+Index: inc/galctrl.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/galctrl.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 galctrl.hxx
+--- openoffice.org.orig/svx/inc/galctrl.hxx	12 Oct 2006 11:43:24 -0000	1.6
++++ openoffice.org/svx/inc/galctrl.hxx	9 Aug 2007 07:09:57 -0000
+@@ -74,7 +74,6 @@
+ 	
+     GraphicObject		aGraphicObj;
+ 	Rectangle			aPreviewRect;
+-	Sound				aSound;
+     GalleryTheme*       mpTheme;
+ 						
+ 	SVX_DLLPRIVATE BOOL				ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+@@ -96,7 +95,6 @@
+ 	SVX_DLLPRIVATE virtual void		StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ 
+ 						DECL_LINK( MenuSelectHdl, Menu* );
+-						DECL_LINK( SoundEndHdl, Sound* );
+ 						
+ public:					
+ 						
+Index: source/gallery2/galctrl.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/gallery2/galctrl.cxx,v
+retrieving revision 1.25
+diff -u -r1.25 galctrl.cxx
+--- openoffice.org.orig/svx/source/gallery2/galctrl.cxx	27 Jun 2007 18:19:59 -0000	1.25
++++ openoffice.org/svx/source/gallery2/galctrl.cxx	9 Aug 2007 07:27:34 -0000
+@@ -67,7 +67,6 @@
+ {
+ 	SetHelpId( HID_GALLERY_WINDOW );
+     InitSettings();
+-	aSound.SetNotifyHdl( LINK( this, GalleryPreview, SoundEndHdl ) );
+ }
+ 
+ // ------------------------------------------------------------------------
+@@ -80,7 +79,6 @@
+ {
+ 	SetHelpId( HID_GALLERY_PREVIEW );
+     InitSettings();
+-    aSound.SetNotifyHdl( LINK( this, GalleryPreview, SoundEndHdl ) );
+ }
+ 
+ // ------------------------------------------------------------------------
+@@ -281,12 +279,6 @@
+ 
+ // ------------------------------------------------------------------------
+ 
+-IMPL_LINK( GalleryPreview, SoundEndHdl, Sound*, EMPTYARG )
+-{
+-	aSound.SetSoundName( String() );
+-	return 0L;
+-}
+-
+ // -------------------
+ // - GalleryIconView -
+ // -------------------