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

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	workspace.unifysound01.patch 
Log Message:
sigh, another missing bit

workspace.unifysound01.patch:

Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.unifysound01.patch	9 Aug 2007 07:39:53 -0000	1.6
+++ workspace.unifysound01.patch	9 Aug 2007 09:47:05 -0000	1.7
@@ -1719,7 +1719,39 @@
 -	::com::sun::star::uno::Reference< ::com::sun::star::media::XManager > mxManager;
  
      ::std::auto_ptr<PaneHider> mpPaneHider;
+
+--- openoffice.org.orig/sd/source/ui/view/drviewse.cxx	2007-08-09 11:36:51.000000000 +0100
++++ openoffice.org/sd/source/ui/view/drviewse.cxx	2007-08-09 11:43:51.000000000 +0100
+@@ -219,6 +219,11 @@
+ #include <comphelper/processfactory.hxx>
+ #endif
+ 
++#ifndef _AVMEDIA_MEDIAWINDOW_HXX //autogen
++#include <avmedia/mediawindow.hxx>
++#endif
++
++
+ #include "Window.hxx"
  
+ 
+@@ -1680,7 +1685,7 @@
+ 			form::FormButtonType eButtonType = form::FormButtonType_URL;
+ 			aTmp <<= eButtonType;
+ 			xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), aTmp );
+-			if ( Sound::IsSoundFile( rURL ) )
++			if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
+ 			{
+ 				// #105638# OJ
+ 				aTmp <<= sal_True;
+@@ -1721,7 +1726,7 @@
+ 		aTmp <<= eButtonType;
+ 		xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), aTmp );
+ 		// #105638# OJ
+-		if ( Sound::IsSoundFile( rURL ) )
++		if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
+ 		{
+ 			aTmp <<= sal_True;
+ 			xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp );
 Index: source/ui/shells/textdrw.cxx
 ===================================================================
 RCS file: /cvs/sw/sw/source/ui/shells/textdrw.cxx,v