diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-12-19 23:25:21 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-12-19 23:35:16 +0100 |
| commit | 0685b2e73e48adb84cd01355d45551ab478ebcd5 (patch) | |
| tree | 0657007c0530b21005ee981d70bee4f80d1cc984 /svx/source | |
| parent | janitorial (diff) | |
| download | core-0685b2e73e48adb84cd01355d45551ab478ebcd5.tar.gz core-0685b2e73e48adb84cd01355d45551ab478ebcd5.zip | |
Assume that as long as the model is the same, the shape doesn't change.
Even if it is moved from not a page to a page or vice-versa.
This allows assumptions made in the Base Form wizard to hold,
namely that if one:
1) Creates controls (and their associated shapes)
2) Groups the shapes (in a GroupShape)
Then all the shapes still remember their associated control
and vice-versa.
Change-Id: I31975970e7ea2f7978aea7f753de88ecd8e55234
Diffstat (limited to 'svx/source')
| -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 3ff4238eabb8..0862babea87c 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 && !(pOldPage && pPage && pOldModel == pModel)) + if (pOldPage != pPage && pOldModel != pModel) { SvxShape* const pShape(getSvxShape()); if (pShape && !pShape->HasSdrObjectOwnership()) |