From 8c6f8ae57b90bbdc12dc645e1ec0ca34c55a24f9 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 7 Feb 2009 11:30:49 +0000 Subject: [PATCH] backport: handle/discard LCHM entries with no urls svn path=/branches/KDE/4.2/kdegraphics/okular/; revision=922604 --- generators/chm/generator_chm.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp index 45d3f9633..fa8fd3a77 100644 --- a/generators/chm/generator_chm.cpp +++ b/generators/chm/generator_chm.cpp @@ -95,7 +95,8 @@ bool CHMGenerator::loadDocument( const QString & fileName, QVector< Okular::Page foreach(const LCHMParsedEntry &e, topics) { QDomElement item = m_docSyn.createElement(e.name); - item.setAttribute("ViewportName", e.urls.first()); + if (!e.urls.isEmpty()) + item.setAttribute("ViewportName", e.urls.first()); item.setAttribute("Icon", e.imageid); if (e.indent == 0) m_docSyn.appendChild(item); else lastIndentElement[e.indent - 1].appendChild(item); @@ -106,6 +107,9 @@ bool CHMGenerator::loadDocument( const QString & fileName, QVector< Okular::Page int pageNum = 0; foreach(const LCHMParsedEntry &e, topics) { + if (e.urls.isEmpty()) + continue; + const QString &url = e.urls.first(); int pos = url.indexOf ('#'); QString tmpUrl = pos == -1 ? url : url.left(pos);