From ecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 13 Feb 2015 09:55:46 +0100 Subject: tdf#60910 don't lose fontwork objects This reverts commit 0685b2e73e48adb84cd01355d45551ab478ebcd5. --- svx/source/svdraw/svdobj.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svx/source') diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 0862babea87c..3ff4238eabb8 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()) -- cgit