[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_libs/kotext=3A_Make_sure_we_clear_the_d?=
From:       Casper Boemann <cbo () boemann ! dk>
Date:       2011-06-29 9:25:03
Message-ID: 20110629092503.98525A60DE () git ! kde ! org
[Download RAW message or body]

Git commit 767d585098d53fffe181c091e8999618d79a11b8 by Casper Boemann.
Committed on 25/05/2011 at 15:45.
Pushed by boemann into branch 'master'.

Make sure we clear the default template before loading something from file

M  +5    -0    libs/kotext/KoTableOfContentsGeneratorInfo.cpp     

http://commits.kde.org/calligra/767d585098d53fffe181c091e8999618d79a11b8

diff --git a/libs/kotext/KoTableOfContentsGeneratorInfo.cpp \
b/libs/kotext/KoTableOfContentsGeneratorInfo.cpp index 403914c..103ae71 100644
--- a/libs/kotext/KoTableOfContentsGeneratorInfo.cpp
+++ b/libs/kotext/KoTableOfContentsGeneratorInfo.cpp
@@ -292,6 +292,11 @@ void \
KoTableOfContentsGeneratorInfo::loadOdf(KoTextSharedLoadingData *sharedLoad  {
     Q_ASSERT(element.localName() == "table-of-content-source" && \
element.namespaceURI() == KoXmlNS::text);  
+    foreach (const TocEntryTemplate &entryTemplate, m_entryTemplate) {
+        qDeleteAll(entryTemplate.indexEntries);
+    }
+    m_entryTemplate.clear();
+
     m_indexScope = element.attribute("index-scope", "document"); // enum {document, \
chapter}  m_outlineLevel = element.attribute("outline-level","1").toInt();
     m_relativeTabStopPosition = \
element.attribute("relative-tab-stop-position","true") == "true";


[prev in list] [next in list] [prev in thread] [next in thread]