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

List:       kde-commits
Subject:    [Calligra] 81fe332: Don't process hidden chunks. This fixes issue 4 in
From:       Sebastian Sauer <sebastian.sauer () kdab ! com>
Date:       2011-01-10 16:28:55
Message-ID: 20110110162855.86A38A6090 () git ! kde ! org
[Download RAW message or body]

commit 81fe332490071e77defab404215799df9bd69c75
branch master
Author: Sebastian Sauer <sebastian.sauer@kdab.com>
Date:   Mon Jan 10 17:26:43 2011 +0100

    Don't process hidden chunks. This fixes issue 4 in bug 244411 .

diff --git a/filters/words/msword-odf/texthandler.cpp \
b/filters/words/msword-odf/texthandler.cpp index fd8e641..b1d562a 100644
--- a/filters/words/msword-odf/texthandler.cpp
+++ b/filters/words/msword-odf/texthandler.cpp
@@ -1287,7 +1287,7 @@ void KWordTextHandler::runOfText(const wvWare::UString& text, \
wvWare::SharedPtr<  m_mainStyles->insertFontFace(KoFontFace(fontName));
     }
 
-    //only show text that is not hidden
+    //only show text that is not hidden, TODO use text:display="none"
     if (chp->fVanish != 1) {
         //add text string and formatting style to m_paragraph
         m_paragraph->addRunOfText(newText, chp, fontName, m_parser->styleSheet());
diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp \
b/filters/words/msword-odf/wv2/src/parser9x.cpp index 332e316..be1a43a 100644
--- a/filters/words/msword-odf/wv2/src/parser9x.cpp
+++ b/filters/words/msword-odf/wv2/src/parser9x.cpp
@@ -778,6 +778,11 @@ void Parser9x::processChunk( const Chunk& chunk, SharedPtr<const \
                Word97::CHP> ch
     // O(1) nextFootnote() call to something like an O(n) containsFootnote( start, \
                lim )
     // Up to now Word 97, 2000, and 2002 seem to be bug compatible and fullfill that \
precondition.  //
+
+    //only process the chunk if not marked hidden, TODO use text:display="none"
+    if(chp->fVanish == 1)
+        return;
+    
     while ( length > 0 ) {
         U32 disruption = 0xffffffff; // "infinity"
         U32 bkmk_length = 0; //num. of CPs enclosed in a bookmark


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