1 files changed, 27 insertions, 31 deletions

diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx
index e4e9099011a6..75d59bbb43b4 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -19,65 +19,61 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/frame/XModel.hpp>
-
 #include <TitleDialogData.hxx>
 #include <TitleHelper.hxx>
-#include <ChartModelHelper.hxx>
+#include <Diagram.hxx>
 #include <AxisHelper.hxx>
+#include <ChartModel.hxx>
 
 namespace chart
 {
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
 
-TitleDialogData::TitleDialogData( std::unique_ptr<ReferenceSizeProvider> pRefSizeProvider )
-        : aPossibilityList(7)
-        , aExistenceList(7)
+TitleDialogData::TitleDialogData( std::optional<ReferenceSizeProvider> pRefSizeProvider )
+        : aPossibilityList{ true, true, true, true, true, true, true }
+        , aExistenceList{ false, false, false, false, false, false, false }
         , aTextList(7)
         , apReferenceSizeProvider( std::move(pRefSizeProvider) )
 {
-    for (sal_Int32 i = 0; i < 7; i++)
-    {
-        aPossibilityList[i] = true;
-        aExistenceList[i] = false;
-    }
 }
 
-void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChartModel )
+void TitleDialogData::readFromModel( const rtl::Reference<::chart::ChartModel>& xChartModel )
 {
-    uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(xChartModel);
+    rtl::Reference< Diagram > xDiagram = xChartModel->getFirstChartDiagram();
 
     //get possibilities
     uno::Sequence< sal_Bool > aAxisPossibilityList;
     AxisHelper::getAxisOrGridPossibilities( aAxisPossibilityList, xDiagram );
-    aPossibilityList[2]=aAxisPossibilityList[0];//x axis title
-    aPossibilityList[3]=aAxisPossibilityList[1];//y axis title
-    aPossibilityList[4]=aAxisPossibilityList[2];//z axis title
-    aPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title
-    aPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title
+    sal_Bool* pPossibilityList = aPossibilityList.getArray();
+    pPossibilityList[2]=aAxisPossibilityList[0];//x axis title
+    pPossibilityList[3]=aAxisPossibilityList[1];//y axis title
+    pPossibilityList[4]=aAxisPossibilityList[2];//z axis title
+    pPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title
+    pPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title
 
+    sal_Bool* pExistenceList = aExistenceList.getArray();
+    auto pTextList = aTextList.getArray();
     //find out which title exists and get their text
     //main title:
-    for( sal_Int32 nTitleIndex = static_cast< sal_Int32 >( TitleHelper::TITLE_BEGIN);
-         nTitleIndex < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END );
+    for( auto nTitleIndex = +TitleHelper::TITLE_BEGIN;
+         nTitleIndex < +TitleHelper::NORMAL_TITLE_END;
          nTitleIndex++)
     {
-        uno::Reference< XTitle > xTitle =  TitleHelper::getTitle(
+        rtl::Reference< Title > xTitle =  TitleHelper::getTitle(
             static_cast< TitleHelper::eTitleType >( nTitleIndex ), xChartModel );
-        aExistenceList[nTitleIndex] = xTitle.is();
-        aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle );
+        pExistenceList[nTitleIndex] = xTitle.is();
+        pTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle );
     }
 }
 
 bool TitleDialogData::writeDifferenceToModel(
-                          const uno::Reference< frame::XModel >& xChartModel
+                          const rtl::Reference<::chart::ChartModel>& xChartModel
                         , const uno::Reference< uno::XComponentContext >& xContext
-                        , TitleDialogData* pOldState )
+                        , const TitleDialogData* pOldState )
 {
     bool bChanged = false;
-    for( sal_Int32 nN = static_cast< sal_Int32 >( TitleHelper::TITLE_BEGIN );
-         nN < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END );
+    for( auto nN = +TitleHelper::TITLE_BEGIN;
+         nN < +TitleHelper::NORMAL_TITLE_END;
          nN++)
     {
         if( !pOldState || ( pOldState->aExistenceList[nN] != aExistenceList[nN] ) )
@@ -86,7 +82,7 @@ bool TitleDialogData::writeDifferenceToModel(
             {
                 TitleHelper::createTitle(
                     static_cast< TitleHelper::eTitleType >( nN ), aTextList[nN], xChartModel, xContext,
-                    apReferenceSizeProvider.get() );
+                    apReferenceSizeProvider.has_value() ? &*apReferenceSizeProvider : nullptr );
                 bChanged = true;
             }
             else
@@ -98,11 +94,11 @@ bool TitleDialogData::writeDifferenceToModel(
         else if( !pOldState || ( pOldState->aTextList[nN] != aTextList[nN] ) )
         {
             //change content
-            uno::Reference< XTitle > xTitle(
+            rtl::Reference< Title > xTitle(
                 TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) );
             if(xTitle.is())
             {
-                TitleHelper::setCompleteString( aTextList[nN], xTitle, xContext );
+                TitleHelper::setCompleteString( aTextList[nN], xTitle, xContext, nullptr, true );
                 bChanged = true;
             }
         }