[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

[Noel Grandin (via logerrit)]

 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c61fe2b0f90cfa103286523089f2f4678120dbe3
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 9 15:28:58 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 10 09:26:02 2023 +0200

    tdf#155210 FILESAVE ODT Default chart row labels disappear from Writer chart
    
    revert
        commit 6500106dff0f0cd86f509ffd01542aab77c21596
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Tue Apr 19 13:48:55 2022 +0200
        tdf#148635 no need to init ChartDataWrapper more than once
    
    Change-Id: I28f078731bd8bfedbde63d0bb2e5fe40f0a4ff46
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151583
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 40f5a5be9fd228a5d33a3b1218864a38cb70dc1f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151524
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 0cde76dcf22c..70fee10d0276 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -577,14 +577,11 @@ void ChartDataWrapper::switchToInternalDataProvider()
     rtl::Reference< ChartModel > xChartDoc( 
m_spChart2ModelContact->getDocumentModel() );
     if( xChartDoc.is() )
         xChartDoc->createInternalDataProvider( true /*bCloneExistingData*/ );
-    m_xDataAccess.clear();
     initDataAccess();
 }
 
 void ChartDataWrapper::initDataAccess()
 {
-    if (m_xDataAccess)
-        return;
     rtl::Reference< ChartModel > xChartDoc( 
m_spChart2ModelContact->getDocumentModel() );
     if( !xChartDoc.is() )
         return;