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

List:       kde-commits
Subject:    [calligra] sheets: annotations have to come before the text content
From:       Marijn Kruisselbrink <mkruisselbrink () kde ! org>
Date:       2012-05-15 23:20:50
Message-ID: 20120515232050.0F7FFA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 190fcf38b150dce1e55ef48faf8ce0a36ba7d3c1 by Marijn Kruisselbrink.
Committed on 16/05/2012 at 01:19.
Pushed by mkruisselbrink into branch 'master'.

annotations have to come before the text content

M  +2    -2    sheets/Cell.cpp

http://commits.kde.org/calligra/190fcf38b150dce1e55ef48faf8ce0a36ba7d3c1

diff --git a/sheets/Cell.cpp b/sheets/Cell.cpp
index c966d65..3a98c5d 100644
--- a/sheets/Cell.cpp
+++ b/sheets/Cell.cpp
@@ -1224,6 +1224,8 @@ bool Cell::saveOdf(KoXmlWriter& xmlwriter, KoGenStyles &mainStyles,
             xmlwriter.addAttribute("table:number-rows-spanned", QString::number(rowSpan));
     }
 
+    saveOdfAnnotation(xmlwriter);
+
     if (!isEmpty() && link().isEmpty()) {
         QSharedPointer<QTextDocument> doc = richText();
         if (doc) {
@@ -1269,8 +1271,6 @@ bool Cell::saveOdf(KoXmlWriter& xmlwriter, KoGenStyles &mainStyles,
         }
     }
 
-    saveOdfAnnotation(xmlwriter);
-
     xmlwriter.endElement();
     return true;
 }
[prev in list] [next in list] [prev in thread] [next in thread]