merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0586-configmgr-validate-removedtree.diff
blob2616bcc3cd939e59a7543ffbb845eed4724288b9
1 --- configmgr/source/treemgr/nodeimplobj.cxx
2 +++ configmgr/source/treemgr/nodeimplobj.cxx
3 @@ -683,7 +683,7 @@
4 SetNodeImpl::removeElement(aElementName);
6 // handle a added or deleted node
7 - if (aOriginal.isValid())
8 + if (aOriginal.isValid() && aRemovedTree.is())
10 OSL_ENSURE(aRemovedTree.is(), "Cannot take over the removed node");