1 files changed, 11 insertions, 14 deletions
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 40dd7b9cd493..adeb27a02501 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -18,16 +18,13 @@
  */
 
 #include "tp_3D_SceneAppearance.hxx"
-#include <ChartModelHelper.hxx>
 #include <ChartModel.hxx>
 #include <ThreeDHelper.hxx>
 #include <ControllerLockGuard.hxx>
 #include <Diagram.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
+#include <utility>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
@@ -55,10 +52,10 @@ lcl_ModelProperties lcl_getPropertiesFromModel( rtl::Reference<::chart::ChartMod
     lcl_ModelProperties aProps;
     try
     {
-        rtl::Reference< ::chart::Diagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel ) );
+        rtl::Reference< ::chart::Diagram > xDiagram( xModel->getFirstChartDiagram() );
         xDiagram->getPropertyValue( "D3DSceneShadeMode" ) >>= aProps.m_aShadeMode;
         ::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines );
-        aProps.m_eScheme = ::chart::ThreeDHelper::detectScheme( xDiagram );
+        aProps.m_eScheme = xDiagram->detectScheme();
     }
     catch( const uno::Exception & )
     {
@@ -71,7 +68,7 @@ void lcl_setShadeModeAtModel( rtl::Reference<::chart::ChartModel> const & xModel
 {
     try
     {
-        rtl::Reference< ::chart::Diagram > xDiaProp = ::chart::ChartModelHelper::findDiagram( xModel );
+        rtl::Reference< ::chart::Diagram > xDiaProp = xModel->getFirstChartDiagram();
         xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::Any( aShadeMode ));
     }
     catch( const uno::Exception & )
@@ -90,9 +87,9 @@ namespace chart
 #define POS_3DSCHEME_CUSTOM 2
 
 ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(weld::Container* pParent,
-        const rtl::Reference<::chart::ChartModel>& xChartModel,
+        rtl::Reference<::chart::ChartModel> xChartModel,
         ControllerLockHelper& rControllerLockHelper)
-    : m_xChartModel(xChartModel)
+    : m_xChartModel(std::move(xChartModel))
     , m_bUpdateOtherControls(true)
     , m_bCommitToModel(true)
     , m_rControllerLockHelper(rControllerLockHelper)
@@ -161,7 +158,7 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
     // locked controllers
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
     ThreeDHelper::setRoundedEdgesAndObjectLines(
-        ::chart::ChartModelHelper::findDiagram( m_xChartModel ), nCurrentRoundedEdges, nObjectLines );
+        m_xChartModel->getFirstChartDiagram(), nCurrentRoundedEdges, nObjectLines );
 }
 
 void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel()
@@ -272,12 +269,12 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, weld::ComboBox&
         // locked controllers
         ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
-        rtl::Reference< Diagram > xDiagram = ::chart::ChartModelHelper::findDiagram( m_xChartModel );
+        rtl::Reference< Diagram > xDiagram = m_xChartModel->getFirstChartDiagram();
 
         if( m_xLB_Scheme->get_active() == POS_3DSCHEME_REALISTIC )
-            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme::ThreeDLookScheme_Realistic );
+            xDiagram->setScheme( ThreeDLookScheme::ThreeDLookScheme_Realistic );
         else if( m_xLB_Scheme->get_active() == POS_3DSCHEME_SIMPLE )
-            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme::ThreeDLookScheme_Simple );
+            xDiagram->setScheme( ThreeDLookScheme::ThreeDLookScheme_Simple );
         else
         {
             OSL_FAIL( "Invalid Entry selected" );