summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-02-13 09:55:46 +0100
committerDavid Tardon <dtardon@redhat.com>2015-02-13 09:59:36 +0100
commitecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52 (patch)
treea9415d533b2898f543029aac460b2e42e1bd9c5a
parent146461ea6ee7836835416b3fbd023079d9db69e4 (diff)
tdf#60910 don't lose fontwork objects
-rw-r--r--svx/source/svdraw/svdobj.cxx2
1 files changed, 1 insertions, 1 deletions
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())