summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-12-31 16:59:32 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2018-12-31 16:59:32 (GMT)
commitfa3720970fe59d51f235a19cec87c4640c0dab80 (patch)
tree6f5f068a2ceb0bce9c9b3c55af9d13a386a15d3b /src
parentb78af3d7ae63513d555008219cd31294ee134aad (diff)
parent3fc42fad071d1fb05daf9270e1815c79d7407257 (diff)
downloadDoxygen-fa3720970fe59d51f235a19cec87c4640c0dab80.zip
Doxygen-fa3720970fe59d51f235a19cec87c4640c0dab80.tar.gz
Doxygen-fa3720970fe59d51f235a19cec87c4640c0dab80.tar.bz2
Merge branch 'feature/issue_6708' of https://github.com/albert-github/doxygen into albert-github-feature/issue_6708
Diffstat (limited to 'src')
-rw-r--r--src/dot.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dot.cpp b/src/dot.cpp
index 0944a02..eb6c03c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -377,7 +377,6 @@ static bool convertMapFile(FTextStream &t,const char *mapName,
const QCString &context=QCString())
{
QFile f(mapName);
- static QRegExp re("id=\"node[0-9]*\"");
if (!f.open(IO_ReadOnly))
{
err("problems opening map file %s for inclusion in the docs!\n"
@@ -396,7 +395,16 @@ static bool convertMapFile(FTextStream &t,const char *mapName,
if (buf.left(5)=="<area")
{
- t << replaceRef(buf,relPath,urlOnly,context).replace(re,"");
+ QCString replBuf = replaceRef(buf,relPath,urlOnly,context);
+ int indexS = replBuf.find("id=\""), indexE;
+ if (indexS>=0 && (indexE=replBuf.find('"',indexS+4))!=-1)
+ {
+ t << replBuf.left(indexS-1) << replBuf.right(replBuf.length() - indexE - 1);
+ }
+ else
+ {
+ t << replBuf;
+ }
}
}
}