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

List:       kde-commits
Subject:    koffice/kword/part
From:       Jos van den Oever <jos () vandenoever ! info>
Date:       2010-10-23 13:57:27
Message-ID: 20101023135727.1FA9CAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188956 by vandenoever:

Write text:page-sequence if there is no mainTextFrame.

 M  +7 -6      KWOdfWriter.cpp  


--- trunk/koffice/kword/part/KWOdfWriter.cpp #1188955:1188956
@@ -305,19 +305,20 @@
     tmpChangeFile.close();
     bodyWriter->addCompleteElement(&tmpChangeFile);
 
-/*  Do not write out text:page-sequence. It is only allowed when no text
- *  elements like text:p or text:h are written. KOffice does not seem to use
- *  text:page-sequence at all.
-
+    // Do not write out text:page-sequence, if there is a maintTextFrame
+    // The ODF specification does not allow text:page-sequence in office:text
+    // if there is e.g. text:p or text:h there
+    if (!mainTextFrame) {
     bodyWriter->startElement("text:page-sequence");
     foreach (KWPage page, m_document->pageManager()->pages()) {
         Q_ASSERT(m_masterPages.contains(page.pageStyle()));
         bodyWriter->startElement("text:page");
-        bodyWriter->addAttribute("text:master-page-name", m_masterPages.value(page.pageStyle()));
+            bodyWriter->addAttribute("text:master-page-name",
+                    m_masterPages.value(page.pageStyle()));
         bodyWriter->endElement(); // text:page
     }
     bodyWriter->endElement(); // text:page-sequence
- */
+    }
 
     delete tmpBodyWriter;
     tmpBodyWriter = 0;
[prev in list] [next in list] [prev in thread] [next in thread]