#87187# - Use rtl::Reference instead of obsolete vos::ORef

5 files changed, 29 insertions, 23 deletions

diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index cacad9acaef7..62b0160f8b66 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: interactionrequest.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-28 10:42:33 $
+ *  last change: $Author: kso $ $Date: 2001-05-28 12:42:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,8 +84,8 @@
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
 #endif
 
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
+#ifndef _RTL_REF_HXX_
+#include <rtl/ref.hxx>
 #endif
 #ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
@@ -168,7 +168,7 @@ public:
       * @return the continuation choosen by an interaction handler or an empty
       *         reference, if the request was not (yet) handled.
       */
-    vos::ORef< InteractionContinuation > getSelection() const;
+    rtl::Reference< InteractionContinuation > getSelection() const;
 
     /**
       * This method sets a continuation for the request. It also can be used
@@ -180,7 +180,8 @@ public:
       *        current selection.
       */
     void
-    setSelection( const vos::ORef< InteractionContinuation > & rxSelection );
+    setSelection(
+        const rtl::Reference< InteractionContinuation > & rxSelection );
 };
 
 //============================================================================
diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index ce8900587e29..b2c0ccde3c8c 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleauthenticationrequest.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-28 10:42:33 $
+ *  last change: $Author: kso $ $Date: 2001-05-28 12:42:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,9 @@
 #ifndef _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
 #define _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
 
+#ifndef _RTL_REF_HXX_
+#include <rtl/ref.hxx>
+#endif
 #ifndef _UCBHELPER_INTERATIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
 #endif
@@ -89,7 +92,8 @@ namespace ucbhelper {
   */
 class SimpleAuthenticationRequest : public ucbhelper::InteractionRequest
 {
-    vos::ORef< ucbhelper::InteractionSupplyAuthentication > m_xAuthSupplier;
+    rtl::Reference<
+        ucbhelper::InteractionSupplyAuthentication > m_xAuthSupplier;
 
 public:
     /**
@@ -116,7 +120,7 @@ public:
       *
       * @return the supplier for the missing authentication data.
       */
-    const vos::ORef< ucbhelper::InteractionSupplyAuthentication > &
+    const rtl::Reference< ucbhelper::InteractionSupplyAuthentication > &
     getAuthenticationSupplier() const { return m_xAuthSupplier; }
 };
 
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 112a0d0cd4c0..8fb271099f06 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: interactionrequest.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-28 10:48:20 $
+ *  last change: $Author: kso $ $Date: 2001-05-28 12:42:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,7 +93,7 @@ namespace ucbhelper
 
 struct InteractionRequest_Impl
 {
-    vos::ORef< InteractionContinuation > m_xSelection;
+    rtl::Reference< InteractionContinuation > m_xSelection;
     com::sun::star::uno::Any m_aRequest;
     com::sun::star::uno::Sequence<
         com::sun::star::uno::Reference<
@@ -140,14 +140,15 @@ void InteractionRequest::setContinuations(
 }
 
 //=========================================================================
-vos::ORef< InteractionContinuation > InteractionRequest::getSelection() const
+rtl::Reference< InteractionContinuation >
+InteractionRequest::getSelection() const
 {
     return m_pImpl->m_xSelection;
 }
 
 //=========================================================================
 void InteractionRequest::setSelection(
-                const vos::ORef< InteractionContinuation > & rxSelection )
+                const rtl::Reference< InteractionContinuation > & rxSelection )
 {
     m_pImpl->m_xSelection = rxSelection;
 }
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index b5b796e3aed6..315434406762 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleauthenticationrequest.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-28 10:48:20 $
+ *  last change: $Author: kso $ $Date: 2001-05-28 12:42:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,7 +119,7 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
         uno::Reference< task::XInteractionContinuation > > aContinuations( 3 );
     aContinuations[ 0 ] = new InteractionAbort( this );
     aContinuations[ 1 ] = new InteractionRetry( this );
-    aContinuations[ 2 ] = m_xAuthSupplier.getBodyPtr();
+    aContinuations[ 2 ] = m_xAuthSupplier.get();
 
     setContinuations( aContinuations );
 }
diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx
index 0da785667075..016c31ff48a0 100644
--- a/ucbhelper/source/provider/simpleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleinteractionrequest.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kso $ $Date: 2001-05-28 10:48:20 $
+ *  last change: $Author: kso $ $Date: 2001-05-28 12:42:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,10 +131,10 @@ SimpleInteractionRequest::SimpleInteractionRequest(
 //=========================================================================
 const sal_Int32 SimpleInteractionRequest::getResponse() const
 {
-    vos::ORef< InteractionContinuation > xSelection = getSelection();
-    if ( xSelection.isValid() )
+    rtl::Reference< InteractionContinuation > xSelection = getSelection();
+    if ( xSelection.is() )
     {
-        InteractionContinuation * pSelection = xSelection.getBodyPtr();
+        InteractionContinuation * pSelection = xSelection.get();
 
         uno::Reference< task::XInteractionAbort > xAbort(
                                         pSelection, uno::UNO_QUERY );