rpms/openoffice.org/devel openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch, NONE, 1.1.2.1 openoffice.org.spec, 1.1440.2.36, 1.1440.2.37

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch 
Log Message:
add openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch

openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch:

--- NEW FILE openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch ---
Index: source/appl/appopen.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/appopen.cxx,v
retrieving revision 1.116
diff -u -r1.116 appopen.cxx
--- openoffice.org.orig/sfx2/source/appl/appopen.cxx	26 Nov 2007 16:46:28 -0000	1.116
+++ openoffice.org/sfx2/source/appl/appopen.cxx	27 Mar 2008 09:17:09 -0000
@@ -1206,32 +1206,13 @@
 													::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
 				if ( xSystemShellExecute.is() )
 				{
-					if ( aINetProtocol == INET_PROT_FTP ||
-						 aINetProtocol == INET_PROT_HTTP ||
-						 aINetProtocol == INET_PROT_HTTPS )
+					if ( aINetProtocol == INET_PROT_MAILTO )
 					{
-						try
-						{
-							// start browser
-							::rtl::OUString aURLString( aURL.Complete );
-							xSystemShellExecute->execute( aURLString, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
-						}
-						catch ( ::com::sun::star::lang::IllegalArgumentException& )
-						{
-							vos::OGuard aGuard( Application::GetSolarMutex() );
-                            Window *pWindow = SFX_APP()->GetTopWindow();
-							ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
-						}
-						catch ( ::com::sun::star::system::SystemShellExecuteException& )
-						{
-							vos::OGuard aGuard( Application::GetSolarMutex() );
-                            Window *pWindow = SFX_APP()->GetTopWindow();
-							ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
-						}
-
-						return;
+						// don't dispatch mailto hyperlink to desktop dispatcher
+						rReq.RemoveItem( SID_TARGETNAME );
+						rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
 					}
-					else if ( aINetProtocol == INET_PROT_FILE )
+					else
 					{
 						BOOL bLoadInternal = FALSE;
 
@@ -1276,12 +1257,6 @@
 						if ( !bLoadInternal )
 							return;
 					}
-					else if ( aINetProtocol == INET_PROT_MAILTO )
-					{
-						// don't dispatch mailto hyperlink to desktop dispatcher
-						rReq.RemoveItem( SID_TARGETNAME );
-						rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
-					}
 				}
 			}
 			else


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.36
retrieving revision 1.1440.2.37
diff -u -r1.1440.2.36 -r1.1440.2.37
--- openoffice.org.spec	27 Mar 2008 09:16:15 -0000	1.1440.2.36
+++ openoffice.org.spec	27 Mar 2008 09:38:15 -0000	1.1440.2.37
@@ -137,6 +137,7 @@
 Patch64: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 Patch65: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
 Patch66: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch67: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1118,6 +1119,7 @@
 %patch64 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 %patch65 -p1 -b .ooo86924.sfx2.iconchanges.patch
 %patch66 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch67 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2854,7 +2856,7 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Mon Mar 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
+* Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2873,6 +2875,7 @@
 
 * Wed Mar 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.2
 - add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+- add openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 
 * Sun Mar 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.1
 - yet another release candidate