diff -r f0fe7c36ec5c -r 43268373032d branchitem.cpp
--- a/branchitem.cpp	Fri Apr 09 14:24:04 2010 +0000
+++ b/branchitem.cpp	Wed Jun 09 13:14:08 2010 +0000
@@ -1,13 +1,13 @@
+#include "branchitem.h"
+
 #include "attributeitem.h"
-#include "branchitem.h"
 #include "branchobj.h"
 #include "vymmodel.h"
+#include "xlink.h"
 #include "xlinkitem.h"
 
 #include <QDir>
 
-using namespace std;
-
 BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):MapItem (data,parent)
 {
 	//qDebug()<< "Constr. BranchItem";
@@ -31,7 +31,7 @@
 
 BranchItem::~BranchItem()
 {
-	qDebug()<< "Destr. BranchItem "<<getHeading();
+	//qDebug()<< "Destr. BranchItem this="<<this<<"  "<<getHeading();
 	if (lmo) 
 	{
 		delete lmo;
@@ -69,7 +69,7 @@
 	branchCounter++;
 }
 
-QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset) //FIXME-3 Check if everything is saved...
+QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset, QList <Link*> &tmpLinks ) //FIXME-3 Check if everything is saved...
 {
 	// Cloudy stuff can be hidden during exports
 	if (hidden) return QString();
@@ -140,27 +140,15 @@
 	TreeItem *ti=getBranchNum(i);
 	while (ti)
 	{
-		s+=getBranchNum(i)->saveToDir(tmpdir,prefix,offset);
+		s+=getBranchNum(i)->saveToDir(tmpdir,prefix,offset,tmpLinks);
 		i++;
 		ti=getBranchNum(i);
 	}	
 
-	// Save XLinks 
-	QString ol;	// old link
-	QString cl;	// current link
+	// Mark Links for save
 	for (int i=0; i<xlinkCount(); ++i)
-	{
-		cl=getXLinkNum(i)->saveToDir();
-		if (cl!=ol)
-		{
-			s+=cl;
-			ol=cl;
-		} else
-		{
-			qWarning (QString("BranchItem::saveToDir  Ignoring of duplicate xLink in %1").arg(getHeading()));
-			qWarning ()<<"this="<<this<< " i="<<i<<" "<<getXLinkNum(i)<<"  "<<getXLinkNum(i-1);
-		}
-	}	
+		if (!tmpLinks.contains (getXLinkNum (i)->getLink() )) 
+			tmpLinks.append (getXLinkNum(i)->getLink() );
 
     decIndent();
     s+=endElement   (elementName);