summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-12-07 22:24:25 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-12-07 22:24:25 (GMT)
commit83f1dfc59d3c168204cdce74b72edf445dea3b61 (patch)
tree8c5f61143cb8aa03c1d68c3560735b1ac5f953fb
parent1028feb84f85a450a8050b94370e581450f4b87e (diff)
parentbd73456f37dfc2fe9c252ff6cbcea9ed21b2dcea (diff)
downloadDoxygen-83f1dfc59d3c168204cdce74b72edf445dea3b61.zip
Doxygen-83f1dfc59d3c168204cdce74b72edf445dea3b61.tar.gz
Doxygen-83f1dfc59d3c168204cdce74b72edf445dea3b61.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--src/rtfdocvisitor.cpp4
-rw-r--r--src/rtfgen.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index 5d73c57..576581a 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -325,7 +325,7 @@ void RTFDocVisitor::visit(DocURL *u)
{
m_t << "{\\field "
"{\\*\\fldinst "
- "{ HYPERLINK \\\\l \"";
+ "{ HYPERLINK \"";
if (u->isEmail()) m_t << "mailto:";
m_t << u->url();
m_t << "\" }"
@@ -1130,7 +1130,7 @@ void RTFDocVisitor::visitPre(DocHRef *href)
{
m_t << "{\\field "
"{\\*\\fldinst "
- "{ HYPERLINK \\\\l \"" << href->url() << "\" "
+ "{ HYPERLINK \"" << href->url() << "\" "
"}{}"
"}"
"{\\fldrslt "
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 9a7dbee..d8c34ee 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -1049,7 +1049,7 @@ void RTFGenerator::startHtmlLink(const char *url)
if (Config_getBool("RTF_HYPERLINKS"))
{
- t << "{\\field {\\*\\fldinst { HYPERLINK \\\\l \"";
+ t << "{\\field {\\*\\fldinst { HYPERLINK \"";
t << url;
t << "\" }{}";
t << "}{\\fldrslt {\\cs37\\ul\\cf2 ";