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

List:       kde-commits
Subject:    koffice/libs/kotext/opendocument
From:       Casper Boemann <cbr () boemann ! dk>
Date:       2010-11-07 17:56:33
Message-ID: 20101107175633.633C7AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193957 by boemann:

Make sure we don't autoclose bookmarks unless we really have to
BUG:250834


 M  +6 -5      KoTextWriter.cpp  


--- trunk/koffice/libs/kotext/opendocument/KoTextWriter.cpp #1193956:1193957
@@ -111,6 +111,10 @@
     QStack<int> changeStack;
     QMap<int, QString> changeTransTable;
     QList<int> savedDeleteChanges;
+    // Things like bookmarks need to be properly turn down
+    // during a cut and paste operation when their end marker
+    // is not included in the selection.
+    QList<KoInlineObject*> pairedInlineObjectStack;
 };
 
 QString KoTextWriter::Private::getXmlId()
@@ -393,11 +397,6 @@
     if (!styleName.isEmpty())
         writer->addAttribute("text:style-name", styleName);
 
-    // Things like bookmarks need to be properly turn down
-    // during a cut and paste operation when their end marker
-    // is not included in the selection.
-    QList<KoInlineObject*> pairedInlineObjectStack;
-
     // Write the fragments and their formats
     QTextCharFormat blockCharFormat = cursor.blockCharFormat();
     QTextCharFormat previousCharFormat;
@@ -524,9 +523,11 @@
     } // foreach(fragment)
 
     //kDebug(30015) << "pairedInlineObjectStack.sz:" << pairedInlineObjectStack.size();
+    if (to !=-1 && to < block.position() + block.length()) {
     foreach (KoInlineObject* inlineObject, pairedInlineObjectStack) {
         inlineObject->saveOdf(context);
     }
+    }
 
     foreach(int change, changeStack) {
         writer->startElement("text:change-end", false);
[prev in list] [next in list] [prev in thread] [next in thread]