core.git: chart2/source

[Noel Grandin (via logerrit)]

 chart2/source/inc/WeakListenerAdapter.hxx   |   40 ++++++++--------------------
 chart2/source/tools/WeakListenerAdapter.cxx |    7 ----
 2 files changed, 13 insertions(+), 34 deletions(-)

New commits:
commit d7549a402ddc75bd5b8e3a3a2e3aa98d5be85b36
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Sep 20 14:33:57 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 21 16:10:28 2024 +0200

    no need for a template here
    
    it is instantiated only once
    
    Change-Id: I0545219a390eb382bcffd3b1a551245f54c47f90
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173730
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/chart2/source/inc/WeakListenerAdapter.hxx 
b/chart2/source/inc/WeakListenerAdapter.hxx
index f300f1aa0391..e312f7bee56f 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -38,47 +38,31 @@ namespace chart
     the same wrapper that you added, i.e., you should store the adapter as a
     member in the adapted class for later use.</p>
  */
-template< class Listener >
-    class WeakListenerAdapter : public
-    ::cppu::WeakImplHelper< Listener >
+class WeakSelectionChangeListenerAdapter final :
+        public ::cppu::WeakImplHelper< css::view::XSelectionChangeListener >
 {
 public:
-    explicit WeakListenerAdapter( const css::uno::Reference< Listener > & 
xListener ) :
-            m_xListener( xListener )
-    {}
+    explicit WeakSelectionChangeListenerAdapter(
+        const css::uno::Reference< css::view::XSelectionChangeListener > & 
xListener )
+            : m_xListener( xListener ) {}
+    virtual ~WeakSelectionChangeListenerAdapter() override;
 
 protected:
+    // ____ XSelectionChangeListener ____
+    virtual void SAL_CALL selectionChanged(
+        const css::lang::EventObject& aEvent ) override;
+
     // ____ XEventListener (base of all listeners) ____
     virtual void SAL_CALL disposing(
         const css::lang::EventObject& Source ) override
     {
-        css::uno::Reference< css::lang::XEventListener > xEventListener(
-                  css::uno::Reference< Listener >( m_xListener), 
css::uno::UNO_QUERY );
+        css::uno::Reference< css::view::XSelectionChangeListener > 
xEventListener( m_xListener );
         if( xEventListener.is())
             xEventListener->disposing( Source );
     }
 
-    css::uno::Reference< Listener > getListener() const
-    {
-        return m_xListener;
-    }
-
 private:
-    css::uno::WeakReference< Listener > m_xListener;
-};
-
-class WeakSelectionChangeListenerAdapter final :
-        public WeakListenerAdapter< css::view::XSelectionChangeListener >
-{
-public:
-    explicit WeakSelectionChangeListenerAdapter(
-        const css::uno::Reference< css::view::XSelectionChangeListener > & 
xListener );
-    virtual ~WeakSelectionChangeListenerAdapter() override;
-
-protected:
-    // ____ XSelectionChangeListener ____
-    virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent ) override;
+    css::uno::WeakReference< css::view::XSelectionChangeListener > m_xListener;
 };
 
 } //  namespace chart
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx 
b/chart2/source/tools/WeakListenerAdapter.cxx
index 16b3d815031c..b456c5bdadf9 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -26,17 +26,12 @@ using ::com::sun::star::uno::Reference;
 namespace chart
 {
 
-WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
-    const Reference< view::XSelectionChangeListener > & xListener ) :
-        WeakListenerAdapter< css::view::XSelectionChangeListener >( xListener )
-{}
-
 WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
 {}
 
 void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const 
lang::EventObject& aEvent )
 {
-    Reference< view::XSelectionChangeListener > xSelChgListener( getListener() 
);
+    Reference< view::XSelectionChangeListener > xSelChgListener( m_xListener );
     if( xSelChgListener.is())
         xSelChgListener->selectionChanged( aEvent );
 }