[Libreoffice-commits] core.git: svx/source

[Libreoffice Gerrit user]

 svx/source/svdraw/svdobj.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c01b66846d6651600893ae5d3c590e9076065032
Author:     Armin Le Grand <Armin.Le.Grand at cib.de>
AuthorDate: Sat Sep 29 15:25:30 2018 +0200
Commit:     Armin Le Grand <Armin.Le.Grand at cib.de>
CommitDate: Sat Sep 29 19:35:57 2018 +0200

    tdf#120066 Only invalidate SdrModel when SdrObject has SdrPage
    
    Change-Id: If32dd85f8d04a3f597b033272ffc2fc0bb73fbad
    Reviewed-on: https://gerrit.libreoffice.org/61132
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b9ba5a92dda9..e56e0d9e5888 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -947,7 +947,12 @@ void SdrObject::SetChanged()
     // of the next changes. It should not mean to have a SdrModel
     // set (this is guaranteed now), but should be connected to
     // being added to a SdrPage (?)
-    if(IsInserted())
+    // TTTT tdf#120066 Indeed - This triggers e.g. by CustomShape
+    // geometry-presenting SdrObjects that are in a SdrObjGroup,
+    // but the SdrObjGroup is *by purpose* not inserted.
+    // Need to check deeper and maybe identify all ::IsInserted()
+    // calls by rename and let the compiler work...
+    if(nullptr != getSdrPageFromSdrObject())
     {
         getSdrModelFromSdrObject().SetChanged();
     }