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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/import
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2003-11-23 0:19:22
[Download RAW message or body]

CVS commit by goutte: 

Fix header/footer:
- all combinaisons of firt, odd, even are possible.
- by default KWord uses the odd not the even header/footer


  M +13 -10    rtfimport.cpp   1.90


--- koffice/filters/kword/rtf/import/rtfimport.cpp  #1.89:1.90
@@ -57,10 +57,10 @@ static RTFProperty destinationPropertyTa
         PROP(   "@field",       "@fldrslt",     parseFldrslt,           0L, false ),
         PROP(   "@rtf",         "@fonttbl",     parseFontTable,         0L, true ),
-        MEMBER( "@rtf",         "@footer",      parseRichText,          \
evenPagesFooter, true ), +        MEMBER( "@rtf",         "@footer",      \
                parseRichText,          oddPagesFooter, true ),
         PROP(   "@rtf",         "@footnote",    parseFootNote,          0L, true ),
         MEMBER( "@rtf",         "@footerf",     parseRichText,          \
                firstPageFooter, true ),
         MEMBER( "@rtf",         "@footerl",     parseRichText,          \
                oddPagesFooter, true ),
         MEMBER( "@rtf",         "@footerr",     parseRichText,          \
                evenPagesFooter, true ),
-        MEMBER( "@rtf",         "@header",      parseRichText,          \
evenPagesHeader, true ), +        MEMBER( "@rtf",         "@header",      \
                parseRichText,          oddPagesHeader, true ),
         MEMBER( "@rtf",         "@headerf",     parseRichText,          \
                firstPageHeader, true ),
         MEMBER( "@rtf",         "@headerl",     parseRichText,          \
oddPagesHeader, true ), @@ -497,12 +497,15 @@ KoFilter::ConversionStatus \
RTFImport::co  
     // Determine header and footer type
-    // ### FIXME: hType==1 mode is missing (first, odd and even all different.)
-    int hType = facingPages ? 3 : (state.section.titlePage ? 2 : 0);
-    bool hasHeader = !evenPagesHeader.node.isEmpty() ||
-                     (hType == 3 && !oddPagesHeader.node.isEmpty()) ||
-                     (hType == 2 && !firstPageHeader.node.isEmpty());
-    bool hasFooter = !evenPagesFooter.node.isEmpty() ||
-                     (hType == 3 && !oddPagesFooter.node.isEmpty()) ||
-                     (hType == 2 && !firstPageFooter.node.isEmpty());
+    const int hType = facingPages
+        ? (state.section.titlePage ? 3 : 1) : (state.section.titlePage ? 2 : 0);
+
+    const bool hasHeader = !oddPagesHeader.node.isEmpty() ||
+        (facingPages &&!evenPagesHeader.node.isEmpty()) ||
+        (state.section.titlePage && !firstPageHeader.node.isEmpty());
+    const bool hasFooter = !oddPagesFooter.node.isEmpty() ||
+        (facingPages && !evenPagesFooter.node.isEmpty()) ||
+        (state.section.titlePage && !firstPageFooter.node.isEmpty());
+
+    kdDebug(30515) << "hType " << hType << " hasHeader " << hasHeader << " hasFooter \
" << hasFooter << endl;  
     // Create main document


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