CWS gnumake2: avoid export of template symbols

1 files changed, 188 insertions, 32 deletions

diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 528bf855ab58..9b3d4f4c69d8 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -31,35 +31,51 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <general.h>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
+using namespace ::com::sun::star;
 
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
+namespace framework{
 
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
+/*-************************************************************************************************************//**
+    @short          declaration of special continuation for filter selection
+    @descr          Sometimes filter detection during loading document failed. Then we need a possibility
+                    to ask user for his decision. These continuation transport selected filter by user to
+                    code user of interaction.
 
-namespace framework{
+    @attention      This implementation could be used one times only. We don't support a resetable continuation yet!
+                    Why? Normaly interaction should show a filter selection dialog and ask user for his decision.
+                    He can select any filter - then instances of these class will be called by handler ... or user
+                    close dialog without any selection. Then another continuation should be slected by handler to
+                    abort continuations ... Retrying isn't very usefull here ... I think.
 
-//template class FWE_DLLEXPORT ContinuationBase<typename com::sun::star::task::XInteractionApprove>;
-//_________________________________________________________________________________________________________________
-//  non exported const
-//_________________________________________________________________________________________________________________
+    @implements     XInteractionFilterSelect
 
-//_________________________________________________________________________________________________________________
-//  non exported definitions
-//_________________________________________________________________________________________________________________
+    @base           ImplInheritanceHelper1
+                    ContinuationBase
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterSelect >
+{
+    // c++ interface
+    public:
+        ContinuationFilterSelect();
+
+    // uno interface
+    public:
+        virtual void            SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString SAL_CALL getFilter(                                ) throw( ::com::sun::star::uno::RuntimeException );
+
+    // member
+    private:
+        ::rtl::OUString m_sFilter;
+
+};  // class ContinuationFilterSelect
 
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
 
 //---------------------------------------------------------------------------------------------------------
 // initialize continuation with right start values
@@ -85,11 +101,29 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
     return m_sFilter;
 }
 
+class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestFilterSelect_Impl( const ::rtl::OUString& sURL );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+public:
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    comphelper::OInteractionAbort* m_pAbort;
+    ContinuationFilterSelect* m_pFilter;
+};
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL )
 {
     ::rtl::OUString temp;
     css::uno::Reference< css::uno::XInterface > temp2;
@@ -98,7 +132,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
                                                        sURL                                          );
     m_aRequest <<= aFilterRequest;
 
-    m_pAbort  = new ContinuationAbort       ;
+    m_pAbort  = new comphelper::OInteractionAbort;
     m_pFilter = new ContinuationFilterSelect;
 
     m_lContinuations.realloc( 2 );
@@ -110,16 +144,16 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestFilterSelect::isAbort() const
+sal_Bool RequestFilterSelect_Impl::isAbort() const
 {
-    return m_pAbort->isSelected();
+    return m_pAbort->wasSelected();
 }
 
 //---------------------------------------------------------------------------------------------------------
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect::getFilter() const
+::rtl::OUString RequestFilterSelect_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -128,7 +162,7 @@ sal_Bool RequestFilterSelect::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -139,16 +173,102 @@ css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::Runtim
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+
+RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+{
+    pImp = new RequestFilterSelect_Impl( sURL );
+    pImp->acquire();
+}
+
+RequestFilterSelect::~RequestFilterSelect()
+{
+    pImp->release();
+}
+
+
+//---------------------------------------------------------------------------------------------------------
+// return abort state of interaction
+// If it is true, return value of method "getFilter()" will be unspecified then!
+//---------------------------------------------------------------------------------------------------------
+sal_Bool RequestFilterSelect::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestFilterSelect::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);
+}
+
+/*
+class RequestAmbigousFilter_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
+                            const ::rtl::OUString& sSelectedFilter ,
+                            const ::rtl::OUString& sDetectedFilter );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    ContinuationAbort*                                                                                                         m_pAbort        ;
+    ContinuationFilterSelect*                                                                                                  m_pFilter       ;
+};
+
+RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL, const ::rtl::OUString& sSelectedFilter,
+    const ::rtl::OUString& sDetectedFilter )
+{
+    pImp = new RequestAmbigousFilter_Impl( sURL, sSelectedFilter, sDetectedFilter );
+    pImp->acquire();
+}
+
+RequestAmbigousFilter::~RequestAmbigousFilter()
+{
+    pImp->release();
+}
+
+sal_Bool RequestAmbigousFilter::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestAmbigousFilter::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);
+}
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL            ,
+RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
                                               const ::rtl::OUString& sSelectedFilter ,
                                               const ::rtl::OUString& sDetectedFilter )
 {
@@ -173,7 +293,7 @@ RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestAmbigousFilter::isAbort() const
+sal_Bool RequestAmbigousFilter_Impl::isAbort() const
 {
     return m_pAbort->isSelected();
 }
@@ -182,7 +302,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestAmbigousFilter::getFilter() const
+::rtl::OUString RequestAmbigousFilter_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -191,7 +311,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestAmbigousFilter_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -202,9 +322,45 @@ css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::Runt
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter_Impl::getContinuations() throw( css::uno::RuntimeException )
+{
+    return m_lContinuations;
+}
+*/
+
+class InteractionRequest_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    uno::Any m_aRequest;
+    uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+
+public:
+    InteractionRequest_Impl( const ::com::sun::star::uno::Any& aRequest,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations )
+    {
+        m_aRequest = aRequest;
+        m_lContinuations = lContinuations;
+    }
+
+    virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException );
+    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
+            throw( uno::RuntimeException );
+};
+
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException )
+{
+    return m_aRequest;
+}
+
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations()
+    throw( uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+uno::Reference < task::XInteractionRequest > InteractionRequest::CreateRequest(
+    const uno::Any& aRequest, const uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations )
+{
+    return new InteractionRequest_Impl( aRequest, lContinuations );
+}
+
 }       //  namespace framework