From 7cd2b1f27a03846a8f9bcd1e4489cbfebf56bfa2 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 23 Sep 2014 20:37:51 +0200 Subject: [PATCH] Bug 735926 - [PATCH] RTF output: \\diafile and \\mscfile do not work --- src/rtfdocvisitor.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 5e271374d02..a11e42f63e3 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -299,11 +299,12 @@ void RTFDocVisitor::visit(DocVerbatim *s) static int mscindex = 1; QCString baseName(4096); - baseName.sprintf("%s%d", + baseName.sprintf("%s%d%s", (Config_getString("RTF_OUTPUT")+"/inline_mscgraph_").data(), - mscindex++ + mscindex++, + ".msc" ); - QFile file(baseName+".msc"); + QFile file(baseName); if (!file.open(IO_WriteOnly)) { err("Could not open file %s for writing\n",baseName.data()); @@ -1685,7 +1686,7 @@ void RTFDocVisitor::writeMscFile(const QCString &fileName) baseName=baseName.right(baseName.length()-i-1); } QCString outDir = Config_getString("RTF_OUTPUT"); - writeMscGraphFromFile(fileName+".msc",outDir,baseName,MSC_BITMAP); + writeMscGraphFromFile(fileName,outDir,baseName,MSC_BITMAP); if (!m_lastIsPara) m_t << "\\par" << endl; m_t << "{" << endl; m_t << rtf_Style_Reset; @@ -1705,7 +1706,7 @@ void RTFDocVisitor::writeDiaFile(const QCString &fileName) baseName=baseName.right(baseName.length()-i-1); } QCString outDir = Config_getString("RTF_OUTPUT"); - writeDiaGraphFromFile(fileName+".dia",outDir,baseName,DIA_BITMAP); + writeDiaGraphFromFile(fileName,outDir,baseName,DIA_BITMAP); if (!m_lastIsPara) m_t << "\\par" << endl; m_t << "{" << endl; m_t << rtf_Style_Reset;