rpms/openoffice.org/F-13 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.7, 1.8

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15719/F-13

Modified Files:
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
Log Message:
get smoketest to navigate uno package -link option

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
 desktop/source/deployment/manager/dp_manager.cxx                         |   85 ++++++++--
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx                           |   13 +
 desktop/source/pkgchk/unopkg/unopkg_shared.h                             |    1 
 javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java |   10 +
 offapi/com/sun/star/deployment/makefile.mk                               |    1 
 openoffice.org.orig/offapi/com/sun/star/deployment/LinkException.idl     |   66 +++++++
 source/pkgchk/unopkg/unopkg_app.cxx                                      |   14 +
 7 files changed, 177 insertions(+), 13 deletions(-)

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	1 Dec 2008 23:08:50 -0000	1.7
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	22 Feb 2010 15:47:48 -0000	1.8
@@ -370,3 +370,29 @@ diff -u -r1.2.130.1 unopkg_shared.h
      bool option_verbose,
      bool option_bundled);
  
+--- javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java	2010-02-11 13:42:37.000000000 +0000
++++ javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java	2010-02-22 15:43:34.000000000 +0000
+@@ -35,6 +35,7 @@
+ import com.sun.star.uno.XComponentContext;
+ import com.sun.star.lang.XServiceInfo;
+ import com.sun.star.ucb.XCommandEnvironment;
++import com.sun.star.uno.AnyConverter;
+ 
+ /** This service is for use by the smoketest which checks the installation of
+  * extensions. The service provides the XCommandEnvironment interface, which
+@@ -113,6 +114,15 @@
+ //                 approve = true;
+ //             }
+ 
++        try {
++            Object link_Exception =
++                AnyConverter.toObject(
++                    com.sun.star.deployment.LinkException.class, request);
++            if (link_Exception != null)
++                approve = false;
++        } catch( Exception e ) {
++        }
++
+         com.sun.star.task.XInteractionContinuation[] conts = xRequest.getContinuations();
+         for (int i = 0; i < conts.length; i++)
+         {