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

[David Tardon]

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

New commits:
commit ecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52
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.

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0862bab..3ff4238 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -530,7 +530,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())