#91062# support new job execution mechanism

3 files changed, 25 insertions, 11 deletions

diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index df4df74394b2..26d902ca21b5 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: mh $ $Date: 2001-08-08 09:22:18 $
+#   last change: $Author: as $ $Date: 2001-12-05 13:28:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -98,7 +98,7 @@ SLOFILES=	\
 
 
 
-SRCFILES=			abspilot.src	\
+SRCFILES=			abspilot.src
 
 RESLIB1NAME=abp
 RESLIB1SRSFILES= $(SRS)/abp.srs
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 62f86f781999..7a7cbfda4463 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodialogabp.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-09-28 09:57:18 $
+ *  last change: $Author: as $ $Date: 2001-12-05 13:28:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,13 +200,21 @@ namespace abp
     }
 
     //--------------------------------------------------------------------------
-    Any SAL_CALL OABSPilotUno::execute( const Reference< XInterface >& xContext, const Sequence< NamedValue >& aArgs ) throw (IllegalArgumentException, RuntimeException)
+    Any SAL_CALL OABSPilotUno::execute( const Sequence< NamedValue >& lArgs ) throw (IllegalArgumentException, Exception, RuntimeException)
     {
         // not interested in the context, not interested in the args
         // -> call the execute method of the XExecutableDialog
+        static_cast< XExecutableDialog* >( this )->execute();
 
-        sal_Bool bSuccess = static_cast< XExecutableDialog* >( this )->execute() ? sal_True : sal_False;
-        return makeAny( bSuccess );
+        // result interest not realy ...
+        // We show this dialog one times only!
+        // User has one chance to accept it or not.
+        // (or he can start it again by using wizard-menu!)
+        // So we should deregister it on our general job execution service by using right protocol parameters.
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1);
+        lProtocol[0].Name    = ::rtl::OUString::createFromAscii("Deactivate");
+        lProtocol[0].Value <<= sal_True;
+        return makeAny( lProtocol );
     }
 
 //.........................................................................
@@ -216,6 +224,9 @@ namespace abp
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.4  2001/09/28 09:57:18  fs
+ *  #91062# forgot the return value ...
+ *
  *  Revision 1.3  2001/09/25 14:17:40  fs
  *  #91062# signature of XJob::execute slightly changed
  *
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index 4f1ffc4f3eed..71bf79856204 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodialogabp.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-09-25 14:17:40 $
+ *  last change: $Author: as $ $Date: 2001-12-05 13:28:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,7 @@ namespace abp
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 
         // XJob
-        virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     protected:
     // OGenericUnoDialog overridables
@@ -143,6 +143,9 @@ namespace abp
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.3  2001/09/25 14:17:40  fs
+ *  #91062# signature of XJob::execute slightly changed
+ *
  *  Revision 1.2  2001/09/14 09:56:05  fs
  *  #91062# support the XJob interface
  *