[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

[Lionel Elie Mamane]

 svx/source/svdraw/svdobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc391e9229f3670e1ca53b017914b840be208ada
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Dec 19 23:25:21 2014 +0100

    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
    Reviewed-on: https://gerrit.libreoffice.org/13559
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index a683ab2..7eb521e 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 && !(pOldPage && pPage && pOldModel == pModel))
+    if (pOldPage != pPage && pOldModel != pModel)
     {
         SvxShape* const pShape(getSvxShape());
         if (pShape && !pShape->HasSdrObjectOwnership())