Commit 7cd2b1f2 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 735926 - [PATCH] RTF output: \\diafile and \\mscfile do not work

parent 8b391584
...@@ -299,11 +299,12 @@ void RTFDocVisitor::visit(DocVerbatim *s) ...@@ -299,11 +299,12 @@ void RTFDocVisitor::visit(DocVerbatim *s)
static int mscindex = 1; static int mscindex = 1;
QCString baseName(4096); QCString baseName(4096);
baseName.sprintf("%s%d", baseName.sprintf("%s%d%s",
(Config_getString("RTF_OUTPUT")+"/inline_mscgraph_").data(), (Config_getString("RTF_OUTPUT")+"/inline_mscgraph_").data(),
mscindex++ mscindex++,
".msc"
); );
QFile file(baseName+".msc"); QFile file(baseName);
if (!file.open(IO_WriteOnly)) if (!file.open(IO_WriteOnly))
{ {
err("Could not open file %s for writing\n",baseName.data()); err("Could not open file %s for writing\n",baseName.data());
...@@ -1685,7 +1686,7 @@ void RTFDocVisitor::writeMscFile(const QCString &fileName) ...@@ -1685,7 +1686,7 @@ void RTFDocVisitor::writeMscFile(const QCString &fileName)
baseName=baseName.right(baseName.length()-i-1); baseName=baseName.right(baseName.length()-i-1);
} }
QCString outDir = Config_getString("RTF_OUTPUT"); 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; if (!m_lastIsPara) m_t << "\\par" << endl;
m_t << "{" << endl; m_t << "{" << endl;
m_t << rtf_Style_Reset; m_t << rtf_Style_Reset;
...@@ -1705,7 +1706,7 @@ void RTFDocVisitor::writeDiaFile(const QCString &fileName) ...@@ -1705,7 +1706,7 @@ void RTFDocVisitor::writeDiaFile(const QCString &fileName)
baseName=baseName.right(baseName.length()-i-1); baseName=baseName.right(baseName.length()-i-1);
} }
QCString outDir = Config_getString("RTF_OUTPUT"); 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; if (!m_lastIsPara) m_t << "\\par" << endl;
m_t << "{" << endl; m_t << "{" << endl;
m_t << rtf_Style_Reset; m_t << rtf_Style_Reset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment