diff -r 2d4cc445a86a -r ee6b0f3a4c2f exports.cpp --- a/exports.cpp Mon Mar 23 09:06:51 2009 +0000 +++ b/exports.cpp Thu Mar 26 07:49:17 2009 +0000 @@ -129,7 +129,7 @@ caption=vymName+ " -" +QObject::tr("Export as ASCII")+" "+QObject::tr("(still experimental)"); } -void ExportASCII::doExport() +void ExportASCII::doExport() //FIXME-1 segfaults... { QFile file (outputFile); if ( !file.open( QIODevice::WriteOnly ) ) @@ -189,10 +189,10 @@ } // If necessary, write note - if (!bo->getNote().isEmpty()) + if (!cur->getNoteObj().isEmpty()) { curIndent +=" | "; - s=bo->getNoteASCII( curIndent, 80); + s=cur->getNoteASCII( curIndent, 80); ts << s; } } @@ -240,9 +240,9 @@ if (!bo->hasHiddenExportParent() ) { // If necessary, write note - if (!bo->getNote().isEmpty()) + if (!cur->getNoteObj().isEmpty()) { - s =bo->getNoteASCII(); + s =cur->getNoteASCII(); s=s.replace ("\n","\n"+curIndent); ts << ("\""+s+"\","); } else @@ -419,8 +419,8 @@ } // If necessary, write note - if (!bo->getNote().isEmpty()) { - ts << (bo->getNoteASCII()); + if (!cur->getNoteObj().isEmpty()) { + ts << (cur->getNoteASCII()); ts << ("\n"); } } @@ -446,6 +446,7 @@ uint i=0; bo=current->getFirstBranch(); + TreeItem *ti=bo->getTreeItem(); if (bo) { if (!bo->hasHiddenExportParent() ) @@ -457,8 +458,8 @@ r+=""; r+=quotemeta(bo->getHeading()); // If necessary, write note - if (!bo->getNote().isEmpty()) - r+=bo->getNoteOpenDoc(); + if (!ti->getNoteObj().isEmpty()) + r+=ti->getNoteOpenDoc(); r+=""; r+=buildList (bo); // recursivly add deeper branches r+="\n"; @@ -476,7 +477,7 @@ { QString allPages; -/* FIXME not adapted to multiple mapCenters yet +/* FIXME-2 not adapted to multiple mapCenters yet, see patch already done in 1.12.2... // Insert new content content.replace ("",quotemeta(mapCenter->getHeading())); content.replace ("",quotemeta(mapCenter->getAuthor()));