diff -r 3f4bc2397c3c -r 202572375c98 exports.cpp --- a/exports.cpp Wed Jan 25 12:34:55 2006 +0000 +++ b/exports.cpp Wed Jan 25 12:34:55 2006 +0000 @@ -14,9 +14,14 @@ indentPerDepth=" "; } -void ExportBase::setPath (const QString &p) +void ExportBase::setDir(const QString &p) { - filepath=p; + outputDir=p; +} + +void ExportBase::setFile (const QString &p) +{ + outputFile=p; } void ExportBase::setMapCenter(MapCenterObj *mc) @@ -43,11 +48,11 @@ void ExportBase::exportXML() { - QFile file (filepath); + QFile file (outputFile); if ( !file.open( IO_WriteOnly ) ) { // FIXME experimental, testing - cout << "ExportBase::exportXML couldn't open "<",quotemeta(mapCenter->getHeading())); content.replace ("",quotemeta(mapCenter->getAuthor())); @@ -243,7 +247,7 @@ QFile f (contentFile); if ( !f.open( IO_WriteOnly ) ) { - mainWindow->statusMessage(QString(QObject::tr("Could not write to %1")).arg(outputFile)); + mainWindow->statusMessage(QString(QObject::tr("Could not write to %1")).arg(contentFile)); return; } @@ -279,8 +283,9 @@ pageTemplateFile=templateDir+"page-template.xml"; sectionTemplateFile=templateDir+"section-template.xml"; - outputFile=tmpDir.currentDirPath()+"/vym-out.odp"; - + if (set.readEntry("useSections").contains("yes")) + useSections=true; + // Copy template to tmpdir system ("cp -r "+templateDir+"* "+tmpDir.path());