diff -r c48bb42fb977 -r b98c1793bb8b vymmodel.cpp
--- a/vymmodel.cpp	Wed Apr 07 10:45:24 2010 +0000
+++ b/vymmodel.cpp	Fri Apr 09 14:16:02 2010 +0000
@@ -10,7 +10,6 @@
 #include "editxlinkdialog.h"
 #include "exports.h"
 #include "exporthtmldialog.h"
-#include "exportxhtmldialog.h"
 #include "file.h"
 #include "findresultmodel.h"
 #include "geometry.h"		// for addBBox
@@ -3473,21 +3472,6 @@
 			exportImage (fname,false,format);
 		}
 	/////////////////////////////////////////////////////////////////////
-	} else if (com=="exportXHTML")
-	{
-		QString fname="";
-		ok=true;
-		if (parser.parCount()>=2)
-			// Hey, we even have a filename
-			fname=parser.parString(ok,1); 
-		if (!ok)
-		{
-			parser.setError (Aborted,"Could not read filename");
-		} else
-		{
-			exportXHTML (fname,false);
-		}
-	/////////////////////////////////////////////////////////////////////
 	} else if (com=="exportXML")
 	{
 		QString fname="";
@@ -4371,48 +4355,6 @@
 	ex.doExport(useDialog);
 }
 
-void VymModel::exportXHTML (const QString &dir, bool askForName)
-{
-	ExportXHTMLDialog dia(NULL);
-	dia.setFilePath (filePath );
-	dia.setMapName (mapName );
-	dia.readSettings();
-	if (dir!="") dia.setDir (dir);
-
-	bool ok=true;
-	
-	if (askForName)
-	{
-		if (dia.exec()!=QDialog::Accepted) 
-			ok=false;
-		else	
-		{
-			QDir d (dia.getDir());
-			// Check, if warnings should be used before overwriting
-			// the output directory
-			if (d.exists() && d.count()>0)
-			{
-				WarningDialog warn;
-				warn.showCancelButton (true);
-				warn.setText(QString(
-					"The directory %1 is not empty.\n"
-					"Do you risk to overwrite some of its contents?").arg(d.path() ));
-				warn.setCaption("Warning: Directory not empty");
-				warn.setShowAgainName("mainwindow/overwrite-dir-xhtml");
-
-				if (warn.exec()!=QDialog::Accepted) ok=false;
-			}
-		}	
-	}
-
-	if (ok)
-	{
-		exportXML (dia.getDir(),false );
-		dia.doExport(mapName );
-		//if (dia.hasChanged()) setChanged();
-	}
-}
-
 void VymModel::exportOOPresentation(const QString &fn, const QString &cf)
 {
 	ExportOO ex;