loplugin:mergeclasses

Change-Id: If5da1527a048997aec1dbc07afbdddabd2c4168d

2 files changed, 10 insertions, 27 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index adcd73dbe837..82d53c3f4f1a 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -136,7 +136,6 @@ merge chart::ResourceChangeListener with chart::ChartTypeTabPage
 merge chart::WindowController with chart::ChartController
 merge comphelper::IPropertyInfoService with frm::ConcreteInfoService
 merge comphelper::NameContainerImpl with comphelper::NameContainer
-merge comphelper::OInteractionSelect with comphelper::OInteraction
 merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper
 merge comphelper::OStatefulPropertySet with PropertySetBase
 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 7135d991e39b..99e6caf2aa7d 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -36,26 +36,6 @@ namespace comphelper
 
 
 
-    //= OInteractionSelect
-
-    /** base class for concrete XInteractionContinuation implementations.<p/>
-        Instances of the classes maintain a flag indicating if the handler was called.
-    */
-    class OInteractionSelect
-    {
-        bool    m_bSelected : 1;    /// indicates if the select event occurred
-
-    protected:
-        OInteractionSelect() : m_bSelected(false) { }
-
-    public:
-        /// determines whether or not this handler was selected
-        bool    wasSelected() const { return m_bSelected; }
-    protected:
-        void    implSelected() { m_bSelected = true; }
-    };
-
-
     //= OInteraction
 
     /** template for instantiating concret interaction handlers<p/>
@@ -63,21 +43,25 @@ namespace comphelper
     */
     template <class INTERACTION>
     class OInteraction
-            :public ::cppu::WeakImplHelper< INTERACTION >
-            ,public OInteractionSelect
+            : public ::cppu::WeakImplHelper< INTERACTION >
     {
     public:
-        OInteraction() { }
+        OInteraction() : m_bSelected(false) {}
+
+        /// determines whether or not this handler was selected
+        bool    wasSelected() const { return m_bSelected; }
 
-    // XInteractionContinuation
-        virtual void SAL_CALL select(  ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        // XInteractionContinuation
+        virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    private:
+        bool    m_bSelected : 1;    /// indicates if the select event occurred
     };
 
 
     template <class INTERACTION>
     void SAL_CALL OInteraction< INTERACTION >::select(  ) throw(::com::sun::star::uno::RuntimeException)
     {
-        implSelected();
+        m_bSelected = true;
     }