#87187# - Parameter's type changed from XContent -> XContentIdentifier.

4 files changed, 27 insertions, 24 deletions

diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index 41964e2a8a16..ea188cac80a1 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cancelcommandexecution.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-06 11:19:32 $
+ *  last change: $Author: kso $ $Date: 2001-06-15 08:47:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,7 @@
 
 namespace com { namespace sun { namespace star {
     namespace uno { class Any; }
-    namespace ucb { class XCommandEnvironment; class XContent; }
+    namespace ucb { class XCommandEnvironment; class XContentIdentifier; }
 } } }
 
 namespace ucbhelper
@@ -114,7 +114,8 @@ void cancelCommandExecution( const com::sun::star::uno::Any & rException,
 
     NOTE THAT THIS FUNCTION NEVER RETURNS! IT ALWAYS THROWS AN EXCEPTION!
 
-    @param xContent is the UCB content executing the command to cancel.
+    @param xId is the identifier of the UCB content related to the command to
+           cancel.
 
     @param eError is an IO error code.
 
@@ -122,7 +123,7 @@ void cancelCommandExecution( const com::sun::star::uno::Any & rException,
            Handler to use before throwing the appropriate exception.
  */
 void cancelCommandExecution( const com::sun::star::uno::Reference<
-                                com::sun::star::ucb::XContent > & xContent,
+                                com::sun::star::ucb::XContentIdentifier > & xId,
                              const com::sun::star::ucb::IOErrorCode eError,
                              const com::sun::star::uno::Reference<
                                 com::sun::star::ucb::XCommandEnvironment > &
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
index 1aa475739d50..6614331cf0b2 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleioerrorrequest.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-29 13:02:01 $
+ *  last change: $Author: kso $ $Date: 2001-06-15 08:47:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,14 +65,15 @@
 #ifndef _COM_SUN_STAR_UCB_IOERRORCODE_HPP_
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_
-#include <com/sun/star/ucb/XContent.hpp>
-#endif
 
 #ifndef _UCBHELPER_INTERATIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
 #endif
 
+namespace com { namespace sun { namespace star { namespace ucb {
+    class XContentIdentifier;
+} } } }
+
 namespace ucbhelper {
 
 /**
@@ -90,13 +91,13 @@ public:
     /**
       * Constructor.
       *
-      * @param xContent contains the UCB content supplying the request.
-      *        For example, the interaction handler can use this interface
-      *        to obtain the content's URL.
+      * @param xId contains the identifier of the UCB content related to the
+      *        request.
+      *
       * @param eError
       */
     SimpleIOErrorRequest( const com::sun::star::uno::Reference<
-                            com::sun::star::ucb::XContent > & xContent,
+                            com::sun::star::ucb::XContentIdentifier > & xId,
                           const com::sun::star::ucb::IOErrorCode eError );
 };
 
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 75cf64260967..ef204df8fe6a 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cancelcommandexecution.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-11 06:52:09 $
+ *  last change: $Author: kso $ $Date: 2001-06-15 08:48:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,14 +134,15 @@ void cancelCommandExecution( const uno::Any & rException,
 }
 
 //=========================================================================
-void cancelCommandExecution( const uno::Reference< ucb::XContent > & xContent,
+void cancelCommandExecution( const uno::Reference<
+                                        ucb::XContentIdentifier > & xId,
                              const ucb::IOErrorCode eError,
                              const uno::Reference<
                                         ucb::XCommandEnvironment > & xEnv )
     throw( uno::Exception )
 {
     rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest
-        = new ucbhelper::SimpleIOErrorRequest( xContent, eError );
+        = new ucbhelper::SimpleIOErrorRequest( xId, eError );
 
     if ( xEnv.is() )
     {
@@ -157,7 +158,7 @@ void cancelCommandExecution( const uno::Reference< ucb::XContent > & xContent,
             if ( xSelection.is() )
                 throw ucb::CommandFailedException(
                                     rtl::OUString(),
-                                    xContent,
+                                    xId,
                                     xRequest->getRequest() );
         }
     }
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index 7730eb0bd716..618fd0483ab4 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleioerrorrequest.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-11 06:52:57 $
+ *  last change: $Author: kso $ $Date: 2001-06-15 08:48:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,13 +72,13 @@ using namespace ucbhelper;
 
 //=========================================================================
 SimpleIOErrorRequest::SimpleIOErrorRequest(
-                            const uno::Reference< ucb::XContent > & xContent,
-                            const com::sun::star::ucb::IOErrorCode eError )
+                        const uno::Reference< ucb::XContentIdentifier > & xId,
+                        const com::sun::star::ucb::IOErrorCode eError )
 {
     // Fill request...
     ucb::InteractiveIOException aRequest;
 //    aRequest.Message        = // OUString
-    aRequest.Context         = xContent;
+    aRequest.Context         = xId;
     aRequest.Classification  = task::InteractionClassification_ERROR;
     aRequest.Code            = eError;