summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-09-23 18:37:51 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-09-23 18:37:51 (GMT)
commit7cd2b1f27a03846a8f9bcd1e4489cbfebf56bfa2 (patch)
tree2196e50938c3c019d71f8621a992ffb697d3e2e7 /src
parent8b39158436b740a78166f947de375b5486441c93 (diff)
downloadDoxygen-7cd2b1f27a03846a8f9bcd1e4489cbfebf56bfa2.zip
Doxygen-7cd2b1f27a03846a8f9bcd1e4489cbfebf56bfa2.tar.gz
Doxygen-7cd2b1f27a03846a8f9bcd1e4489cbfebf56bfa2.tar.bz2
Bug 735926 - [PATCH] RTF output: \\diafile and \\mscfile do not work
Diffstat (limited to 'src')
-rw-r--r--src/rtfdocvisitor.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index 5e27137..a11e42f 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;