[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

[David Tardon]

 svx/source/svdraw/svdobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 600d6eda0028a7b4927547970a9d683a1437e4c8
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Feb 13 09:55:46 2015 +0100

    tdf#60910 don't lose fontwork objects
    
    This reverts commit 0685b2e73e48adb84cd01355d45551ab478ebcd5.
    
    (cherry picked from commit ecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52)
    
    Change-Id: I843dce1f9551529d125435e5e8eb9fa759a5af23
    Reviewed-on: https://gerrit.libreoffice.org/14461
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 7eb521e..a683ab2 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -508,7 +508,7 @@ void SdrObject::SetPage(SdrPage* pNewPage)
     // If the page is changing to another page with the same model, we
     // assume they create compatible UNO shape objects so we shouldn't have
     // to invalidate.
-    if (pOldPage != pPage && pOldModel != pModel)
+    if (pOldPage != pPage && !(pOldPage && pPage && pOldModel == pModel))
     {
         SvxShape* const pShape(getSvxShape());
         if (pShape && !pShape->HasSdrObjectOwnership())