1 files changed, 16 insertions, 19 deletions
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 0829ceffafa0..c134601944ff 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -16,15 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CHART2_SOURCE_INC_UNCACHEDDATASEQUENCE_HXX
-#define INCLUDED_CHART2_SOURCE_INC_UNCACHEDDATASEQUENCE_HXX
+#pragma once
 
 // helper classes
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include <comphelper/propertycontainer.hxx>
+#include <comphelper/propertycontainer2.hxx>
 #include <comphelper/proparrhlp.hxx>
+#include <rtl/ref.hxx>
 
 // interfaces and types
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,10 +41,12 @@ namespace com::sun::star::chart2 { class XInternalDataProvider; }
 
 namespace chart
 {
+class InternalDataProvider;
+class ModifyEventForwarder;
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper<
+typedef ::comphelper::WeakComponentImplHelper<
     css::chart2::data::XDataSequence,
     css::chart2::data::XNumericalDataSequence,
     css::chart2::data::XTextualDataSequence,
@@ -67,8 +69,7 @@ typedef ::cppu::WeakComponentImplHelper<
  * 'label 2', ...</p>
  */
 class UncachedDataSequence final :
-        public ::comphelper::OMutexAndBroadcastHelper,
-        public ::comphelper::OPropertyContainer,
+        public ::comphelper::OPropertyContainer2,
         public ::comphelper::OPropertyArrayUsageHelper< UncachedDataSequence >,
         public impl::UncachedDataSequence_Base
 {
@@ -77,11 +78,11 @@ public:
         lifetime is at least as long as the one of this object.
      */
     UncachedDataSequence(
-        const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv,
-        const OUString & rRangeRepresentation );
+        rtl::Reference< InternalDataProvider > xIntDataProv,
+        OUString aRangeRepresentation );
     UncachedDataSequence(
-        const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv,
-        const OUString & rRangeRepresentation,
+        rtl::Reference< InternalDataProvider > xIntDataProv,
+        OUString aRangeRepresentation,
         const OUString & rRole );
     UncachedDataSequence( const UncachedDataSequence & rSource );
     virtual ~UncachedDataSequence() override;
@@ -101,7 +102,7 @@ private:
     /// @see css::beans::XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     /// @see ::comphelper::OPropertySetHelper
-    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
+    virtual ::cppu::IPropertyArrayHelper& getInfoHelper() override;
     /// @see ::comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
@@ -161,15 +162,11 @@ private:
      */
     void registerProperties();
 
-    css::uno::Reference< css::chart2::XInternalDataProvider > m_xDataProvider;
-    OUString                 m_aSourceRepresentation;
-    css::uno::Reference< css::util::XModifyListener >
-        m_xModifyEventForwarder;
+    rtl::Reference< InternalDataProvider > m_xDataProvider;
+    OUString m_aSourceRepresentation;
+    rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder;
 };
 
 }  // namespace chart
 
-// INCLUDED_CHART2_SOURCE_INC_UNCACHEDDATASEQUENCE_HXX
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */