1 files changed, 17 insertions, 11 deletions
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 7eeb4646bfc7..5957a7e2942f 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -26,15 +26,19 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <unotools/eventlisteneradapter.hxx>
-
+#include <rtl/ref.hxx>
+#include <svx/unopage.hxx>
 #include <memory>
 
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XRefreshable; }
+namespace chart { class ChartView; }
 
 namespace chart::wrapper
 {
-
+class DiagramWrapper;
+class LegendWrapper;
+class TitleWrapper;
 class Chart2ModelContact;
 
 class ChartDocumentWrapper_Base : public ::cppu::ImplInheritanceHelper
@@ -48,7 +52,7 @@ class ChartDocumentWrapper_Base : public ::cppu::ImplInheritanceHelper
 {
 };
 
-class ChartDocumentWrapper : public ChartDocumentWrapper_Base
+class ChartDocumentWrapper final : public ChartDocumentWrapper_Base
                            , public ::utl::OEventListenerAdapter
 {
 public:
@@ -72,9 +76,7 @@ public:
     css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const;
-
-protected:
+    rtl::Reference<SvxDrawPage> impl_getDrawPage() const;
 
     // ____ chart::XChartDocument ____
     virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() override;
@@ -137,6 +139,10 @@ protected:
     virtual std::vector< std::unique_ptr<WrappedProperty> > createWrappedProperties() override;
     virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
 
+    // ____ XPropertySet ____
+    virtual void SAL_CALL setPropertyValue(const OUString& rPropertyName,
+                                           const css::uno::Any& rValue) override;
+
 private: //methods
     void impl_resetAddIn();
 
@@ -145,18 +151,18 @@ private: //member
 
     css::uno::Reference< css::uno::XInterface >   m_xDelegator;
 
-    css::uno::Reference< css::drawing::XShape >   m_xTitle;
-    css::uno::Reference< css::drawing::XShape >   m_xSubTitle;
-    css::uno::Reference< css::drawing::XShape >   m_xLegend;
+    rtl::Reference< TitleWrapper >   m_xTitle;
+    rtl::Reference< TitleWrapper >   m_xSubTitle;
+    rtl::Reference< LegendWrapper >   m_xLegend;
     css::uno::Reference< css::chart::XChartData > m_xChartData;
-    css::uno::Reference< css::chart::XDiagram >   m_xDiagram;
+    rtl::Reference< DiagramWrapper >   m_xDiagram;
     css::uno::Reference< css::beans::XPropertySet > m_xArea;
 
     css::uno::Reference< css::util::XRefreshable > m_xAddIn;
     OUString   m_aBaseDiagram;
     bool        m_bUpdateAddIn;
 
-    css::uno::Reference< css::uno::XInterface >   m_xChartView;
+    rtl::Reference< ChartView >                   m_xChartView;
     css::uno::Reference< css::lang::XMultiServiceFactory>
                                                   m_xShapeFactory;