From 18110ca3bdc9542e28480d5719f33c429b325402 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 27 Jul 2015 20:43:53 +0200
Subject: comphelper, desktop: fix MSVC mergedlib link failure

Duplicate symbols are easily avoided by removing duplicate code.

Change-Id: I9b598a44156d6ff71b0691e69ab8163b15e2e26f
---
 desktop/source/deployment/misc/dp_interact.cxx | 41 +++-----------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

(limited to 'desktop/source')

diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 8407c50b4a39..69f855865bb4 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -19,6 +19,9 @@
 
 
 #include "dp_interact.h"
+
+#include <comphelper/interaction.hxx>
+
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/task/XInteractionAbort.hpp>
@@ -88,42 +91,6 @@ void InteractionContinuationImpl::select() throw (RuntimeException, std::excepti
     *m_pselect = true;
 }
 
-
-class InteractionRequest :
-    public ::cppu::WeakImplHelper<task::XInteractionRequest>
-{
-    Any m_request;
-    Sequence< Reference<task::XInteractionContinuation> > m_conts;
-
-public:
-    inline InteractionRequest(
-        Any const & request,
-        Sequence< Reference<task::XInteractionContinuation> > const & conts )
-        : m_request( request ),
-          m_conts( conts )
-        {}
-
-    // XInteractionRequest
-    virtual Any SAL_CALL getRequest()
-        throw (RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual Sequence< Reference<task::XInteractionContinuation> >
-    SAL_CALL getContinuations() throw (RuntimeException, std::exception) SAL_OVERRIDE;
-};
-
-// XInteractionRequest
-
-Any InteractionRequest::getRequest() throw (RuntimeException, std::exception)
-{
-    return m_request;
-}
-
-
-Sequence< Reference< task::XInteractionContinuation > >
-InteractionRequest::getContinuations() throw (RuntimeException, std::exception)
-{
-    return m_conts;
-}
-
 } // anon namespace
 
 
@@ -147,7 +114,7 @@ bool interactContinuation( Any const & request,
             conts[ 1 ] = new InteractionContinuationImpl(
                 cppu::UnoType<task::XInteractionAbort>::get(), &abort );
             xInteractionHandler->handle(
-                new InteractionRequest( request, conts ) );
+                new ::comphelper::OInteractionRequest( request, conts ) );
             if (cont || abort) {
                 if (pcont != 0)
                     *pcont = cont;
-- 
cgit