summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-02-13 09:55:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-02-13 09:55:59 +0000
commit600d6eda0028a7b4927547970a9d683a1437e4c8 (patch)
tree373dea9ed7fb63a5cba2136f27afc423760a0fde
parentb72573c15f123633a691bc76098405f24b17ecc2 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 7eb521e2ff53..a683ab2ed767 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())