1.1 --- a/vymmodel.cpp	Wed Apr 07 10:45:24 2010 +0000
     1.2 +++ b/vymmodel.cpp	Fri Apr 09 14:16:02 2010 +0000
     1.3 @@ -10,7 +10,6 @@
     1.4  #include "editxlinkdialog.h"
     1.5  #include "exports.h"
     1.6  #include "exporthtmldialog.h"
     1.7 -#include "exportxhtmldialog.h"
     1.8  #include "file.h"
     1.9  #include "findresultmodel.h"
    1.10  #include "geometry.h"		// for addBBox
    1.11 @@ -3473,21 +3472,6 @@
    1.12  			exportImage (fname,false,format);
    1.13  		}
    1.14  	/////////////////////////////////////////////////////////////////////
    1.15 -	} else if (com=="exportXHTML")
    1.16 -	{
    1.17 -		QString fname="";
    1.18 -		ok=true;
    1.19 -		if (parser.parCount()>=2)
    1.20 -			// Hey, we even have a filename
    1.21 -			fname=parser.parString(ok,1); 
    1.22 -		if (!ok)
    1.23 -		{
    1.24 -			parser.setError (Aborted,"Could not read filename");
    1.25 -		} else
    1.26 -		{
    1.27 -			exportXHTML (fname,false);
    1.28 -		}
    1.29 -	/////////////////////////////////////////////////////////////////////
    1.30  	} else if (com=="exportXML")
    1.31  	{
    1.32  		QString fname="";
    1.33 @@ -4371,48 +4355,6 @@
    1.34  	ex.doExport(useDialog);
    1.35  }
    1.36  
    1.37 -void VymModel::exportXHTML (const QString &dir, bool askForName)
    1.38 -{
    1.39 -	ExportXHTMLDialog dia(NULL);
    1.40 -	dia.setFilePath (filePath );
    1.41 -	dia.setMapName (mapName );
    1.42 -	dia.readSettings();
    1.43 -	if (dir!="") dia.setDir (dir);
    1.44 -
    1.45 -	bool ok=true;
    1.46 -	
    1.47 -	if (askForName)
    1.48 -	{
    1.49 -		if (dia.exec()!=QDialog::Accepted) 
    1.50 -			ok=false;
    1.51 -		else	
    1.52 -		{
    1.53 -			QDir d (dia.getDir());
    1.54 -			// Check, if warnings should be used before overwriting
    1.55 -			// the output directory
    1.56 -			if (d.exists() && d.count()>0)
    1.57 -			{
    1.58 -				WarningDialog warn;
    1.59 -				warn.showCancelButton (true);
    1.60 -				warn.setText(QString(
    1.61 -					"The directory %1 is not empty.\n"
    1.62 -					"Do you risk to overwrite some of its contents?").arg(d.path() ));
    1.63 -				warn.setCaption("Warning: Directory not empty");
    1.64 -				warn.setShowAgainName("mainwindow/overwrite-dir-xhtml");
    1.65 -
    1.66 -				if (warn.exec()!=QDialog::Accepted) ok=false;
    1.67 -			}
    1.68 -		}	
    1.69 -	}
    1.70 -
    1.71 -	if (ok)
    1.72 -	{
    1.73 -		exportXML (dia.getDir(),false );
    1.74 -		dia.doExport(mapName );
    1.75 -		//if (dia.hasChanged()) setChanged();
    1.76 -	}
    1.77 -}
    1.78 -
    1.79  void VymModel::exportOOPresentation(const QString &fn, const QString &cf)
    1.80  {
    1.81  	ExportOO ex;