diff options
| author | David Tardon <dtardon@redhat.com> | 2015-02-13 09:55:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 10:42:39 +0000 |
| commit | 7c8c8bb71658a5993ed07887216ca0420be29d78 (patch) | |
| tree | ead89bd48c88d9451f7cc480c87aced1312c4978 | |
| parent | 9b609d324883c4aaf5291cb6e9414795274290f9 (diff) | |
tdf#60910 don't lose fontwork objects
This reverts commit 0685b2e73e48adb84cd01355d45551ab478ebcd5.
(cherry picked from commit ecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52)
Change-Id: I872e8b1e33c79b2217ab2863a05f37a4852ca578
Reviewed-on: https://gerrit.libreoffice.org/14462
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 2 |
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()) |