diff -r 25a77484ec72 -r db0ec4bcf416 xml-vym.cpp
--- a/xml-vym.cpp	Tue Apr 07 16:15:53 2009 +0000
+++ b/xml-vym.cpp	Mon Apr 20 10:42:05 2009 +0000
@@ -287,6 +287,7 @@
         case StateBranch: 
 			model->selectParent();
 			lastBranchItem=model->getSelectedBranchItem();
+			lastBranchItem->setLastSelectedBranch (0);	// Reset last selected to first child branch
             break;
         case StateHtml: 
 			htmldata+="</"+eName+">";
@@ -441,7 +442,7 @@
 			}           
 		}           
 		if (!a.value( "id").isEmpty() ) 
-			lastOO->setID (a.value ("id"));
+			lastBranchItem->setID (a.value ("id"));
 		if (!a.value( "url").isEmpty() ) 
 			lastOO->setURL (a.value ("url"));
 		if (!a.value( "vymLink").isEmpty() ) 
@@ -582,22 +583,25 @@
 	{ 
 		if (!a.value( "endBranch").isEmpty() ) 
 		{
-			LinkableMapObj *lmo=model->findObjBySelect (a.value( "beginBranch"));
-			if (lmo && typeid (*lmo)==typeid (BranchObj))
+			TreeItem *ti=model->findBySelectString (a.value( "beginBranch"));
+			if (ti && ti->isBranchLikeType())
 			{
+			/* FIXME-2 xLinks
 				xlo->setBegin ((BranchObj*)lmo);
-				lmo=model->findObjBySelect (a.value( "endBranch"));
+				lmo=model->findBySelectString (a.value( "endBranch"));
 				if (lmo && typeid (*lmo)==typeid (BranchObj))
 				{
 					xlo->setEnd ((BranchObj*)(lmo));
 					xlo->activate();
 					success=true;
 				}
+			*/
 			}
 		}           
 	}	
 
 	// object ID is used starting in version 1.8.76
+	/* FIXME-2 xLinks
 	if (!a.value( "beginID").isEmpty() ) 
 	{ 
 		if (!a.value( "endID").isEmpty() ) 
@@ -616,6 +620,7 @@
 			}
 		}           
 	}	
+	*/
 	if (!success) delete (xlo);
 	return true;	// xLinks can only be established at the "end branch", return true
 }