[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-0' - sc/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 29 18:21:29 UTC 2020


 sc/source/core/data/documen5.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a01a61bd582df5bce8a627f6ed56c1b7e680218
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jul 20 19:00:13 2020 +0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Jul 29 20:20:57 2020 +0200

    tdf#31231: don't set charts modified state when !IsEnableSetModified
    
    Modified state  of the chart is part of modified state of owner document:
    see SfxObjectShell::IsModified.
    
    So when the document is loading, any updates to its charts don't make the
    document modified.
    
    Change-Id: Ie7643ff55bd44f1afe3f796f72c2508ea57f65d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99102
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 3e6519714abebf00637c953dbba055d620cfe6f7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99064
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 21a73161caebd26429ac7df40adf3183852e0bdc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99068
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index a06505a31bc0..631f60c863fa 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -336,7 +336,7 @@ void ScDocument::UpdateChart( const OUString& rChartName )
     if (!mpDrawLayer || bInDtorClear)
         return;
     uno::Reference< chart2::XChartDocument > xChartDoc( GetChartByName( rChartName ) );
-    if( xChartDoc.is() )
+    if (xChartDoc && (!mpShell || mpShell->IsEnableSetModified()))
     {
         try
         {


More information about the Libreoffice-commits mailing list