From bfa53df1ece53ff30dec9f02e8dcf97358789bbb Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Sat, 29 Nov 2008 05:34:33 +0000 Subject: [PATCH] Don't crash when setting up the document synopsis for ODTs with strange heading ordering. This may still cause the synopsis to look different to the way the user expected. Will take another look at that. BUG: 168678 svn path=/trunk/KDE/kdegraphics/okular/; revision=890395 --- core/textdocumentgenerator.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp index f79203169..2bd896a13 100644 --- a/core/textdocumentgenerator.cpp +++ b/core/textdocumentgenerator.cpp @@ -201,15 +201,20 @@ void TextDocumentGeneratorPrivate::generateTitleInfos() } else if ( newLevel > level ) { parentNodeStack.push( parentNode ); parentNode = parentNode.lastChildElement(); - parentNode.appendChild( item ); + if ( ! parentNode.isNull() ) { + parentNode.appendChild( item ); + } level = newLevel; } else { for ( int i = level; i > newLevel; i-- ) { level--; - parentNode = parentNodeStack.pop(); + if ( ! parentNodeStack.isEmpty() ) { + parentNode = parentNodeStack.pop(); + } + } + if ( ! parentNode.isNull() ) { + parentNode.appendChild( item ); } - - parentNode.appendChild( item ); } } }