[Libreoffice-commits] core.git: chart2/source

[Noel Grandin (via logerrit)]

 chart2/source/inc/ChartType.hxx              |    4 ++--
 chart2/source/inc/UncachedDataSequence.hxx   |    3 ++-
 chart2/source/model/template/ChartType.cxx   |    6 ++----
 chart2/source/tools/UncachedDataSequence.cxx |   20 ++------------------
 4 files changed, 8 insertions(+), 25 deletions(-)

New commits:
commit 6043d01496fe7e4c2000b2c3121aab759cab0fc3
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Jan 27 18:14:27 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 28 19:28:27 2022 +0100

    use more concrete types in chart2, ModifyEventForwarder
    
    Change-Id: Ibd1102dbc269bb2e9a2afd67fae1e4ec7d51b1ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129110
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx
index 729e58109de5..833fa9783993 100644
--- a/chart2/source/inc/ChartType.hxx
+++ b/chart2/source/inc/ChartType.hxx
@@ -35,6 +35,7 @@
 
 namespace chart
 {
+class ModifyEventForwarder;
 
 namespace impl
 {
@@ -119,8 +120,7 @@ protected:
      DECLARE_XTYPEPROVIDER()
 
 protected:
-    css::uno::Reference< css::util::XModifyListener >
-        const m_xModifyEventForwarder;
+    rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder;
 
 private:
     void impl_addDataSeriesWithoutNotification(
diff --git a/chart2/source/inc/UncachedDataSequence.hxx 
b/chart2/source/inc/UncachedDataSequence.hxx
index e3a51f55727a..6b4c21fe7afe 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -42,6 +42,7 @@ namespace com::sun::star::chart2 { class 
XInternalDataProvider; }
 namespace chart
 {
 class InternalDataProvider;
+class ModifyEventForwarder;
 
 namespace impl
 {
@@ -164,7 +165,7 @@ private:
 
     rtl::Reference< InternalDataProvider > m_xDataProvider;
     OUString m_aSourceRepresentation;
-    css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
+    rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder;
 };
 
 }  // namespace chart
diff --git a/chart2/source/model/template/ChartType.cxx 
b/chart2/source/model/template/ChartType.cxx
index aa0a17453f25..96273874643e 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -242,8 +242,7 @@ void SAL_CALL ChartType::addModifyListener( const 
uno::Reference< util::XModifyL
 {
     try
     {
-        uno::Reference< util::XModifyBroadcaster > xBroadcaster( 
m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->addModifyListener( aListener );
+        m_xModifyEventForwarder->addModifyListener( aListener );
     }
     catch( const uno::Exception & )
     {
@@ -255,8 +254,7 @@ void SAL_CALL ChartType::removeModifyListener( const 
uno::Reference< util::XModi
 {
     try
     {
-        uno::Reference< util::XModifyBroadcaster > xBroadcaster( 
m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->removeModifyListener( aListener );
+        m_xModifyEventForwarder->removeModifyListener( aListener );
     }
     catch( const uno::Exception & )
     {
diff --git a/chart2/source/tools/UncachedDataSequence.cxx 
b/chart2/source/tools/UncachedDataSequence.cxx
index fa069a631870..e8a6075d643e 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -298,28 +298,12 @@ void SAL_CALL UncachedDataSequence::setModified( sal_Bool 
bModified )
 // ____ XModifyBroadcaster (base of XModifiable) ____
 void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< 
util::XModifyListener >& aListener )
 {
-    try
-    {
-        Reference< util::XModifyBroadcaster > xBroadcaster( 
m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->addModifyListener( aListener );
-    }
-    catch( const uno::Exception & )
-    {
-        DBG_UNHANDLED_EXCEPTION("chart2");
-    }
+    m_xModifyEventForwarder->addModifyListener( aListener );
 }
 
 void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< 
util::XModifyListener >& aListener )
 {
-    try
-    {
-        Reference< util::XModifyBroadcaster > xBroadcaster( 
m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->removeModifyListener( aListener );
-    }
-    catch( const uno::Exception & )
-    {
-        DBG_UNHANDLED_EXCEPTION("chart2");
-    }
+    m_xModifyEventForwarder->removeModifyListener( aListener );
 }
 
 void UncachedDataSequence::fireModifyEvent()