InteractionSupplyName is a detail of SimpleNameClashResolveRequest

Change-Id: Iecc77b1c4749bd14ce79f1a7f3e98f45fa3abbba

2 files changed, 5 insertions, 58 deletions

diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 51883c7f891c..a6d04477aec7 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp>
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
-#include <com/sun/star/ucb/XInteractionSupplyName.hpp>
 #include <rtl/ref.hxx>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
@@ -626,59 +625,6 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
 
 /**
   * This class implements a standard interaction continuation, namely the
-  * interface XInteractionSupplyName. Instances of this class can be passed
-  * along with an interaction request to indicate the possibility to
-  * supply a new name.
-  */
-class InteractionSupplyName : public InteractionContinuation,
-                              public com::sun::star::lang::XTypeProvider,
-                              public com::sun::star::ucb::XInteractionSupplyName
-{
-    OUString m_aName;
-
-public:
-    InteractionSupplyName( InteractionRequest * pRequest )
-    : InteractionContinuation( pRequest ) {}
-
-    // XInterface
-    virtual com::sun::star::uno::Any SAL_CALL
-    queryInterface( const com::sun::star::uno::Type & rType )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
-    virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
-
-    // XTypeProvider
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
-    getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-    // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-    // XInteractionSupplyName
-    virtual void SAL_CALL setName( const OUString& Name )
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-    // Non-interface methods.
-
-    /**
-      * This method returns the name that was supplied by the interaction
-      * handler.
-      *
-      * @return the name.
-      */
-    const OUString & getName() const { return m_aName; }
-};
-
-
-/**
-  * This class implements a standard interaction continuation, namely the
   * interface XInteractionReplaceExistingData. Instances of this class can be
   * passed along with an interaction request to indicate the possibility to
   * replace existing data.
diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx
index 33a58b3baed6..c773097a961e 100644
--- a/include/ucbhelper/simplenameclashresolverequest.hxx
+++ b/include/ucbhelper/simplenameclashresolverequest.hxx
@@ -26,6 +26,8 @@
 
 namespace ucbhelper {
 
+class InteractionSupplyName;
+
 /**
   * This class implements a simple name clash resolve interaction request.
   * Instances can be passed directly to XInteractionHandler::handle(...). Each
@@ -36,12 +38,13 @@ namespace ucbhelper {
   * @see com::sun::star::ucb::NameClashResolveRequest
   * @see InteractionAbort
   * @see InteractioneplaceExistingData
-  * @see InteractionSupplyName
   */
 class UCBHELPER_DLLPUBLIC SimpleNameClashResolveRequest : public ucbhelper::InteractionRequest
 {
     rtl::Reference< InteractionSupplyName > m_xNameSupplier;
 
+    virtual ~SimpleNameClashResolveRequest();
+
 public:
     /**
       * Constructor.
@@ -65,9 +68,7 @@ public:
       *
       * @return the new name, if supplied.
       */
-    const OUString getNewName() const
-    { return m_xNameSupplier->getName(); }
-
+    const OUString getNewName() const;
 };
 
 } // namespace ucbhelper