← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libwpd/lucid

« back to all changes in this revision

Viewing changes to src/lib/WP1Parser.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rene Engelhard
  • Date: 2007-01-11 15:15:57 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20070111151557-rn1kysabqbccx3as
Tags: 0.8.8-2
run make check for stream check; build-depend on libcppunit-dev 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/WP1Parser.cpp
26
26
 
27
27
#include "WP1Parser.h"
28
28
#include "WP1Part.h"
29
 
#include "WPXHeader.h"
30
29
#include "libwpd_internal.h"
31
 
#include "WPXTable.h"
32
30
#include "WP1FileStructure.h"
33
31
#include "WP1StylesListener.h"
34
32
#include "WP1ContentListener.h"
35
33
 
36
34
WP1Parser::WP1Parser(WPXInputStream *input) :
37
 
        WPXParser(input, NULL)
 
35
        WPXParser(input, 0)
38
36
{
39
37
}
40
38
 
65
63
 
66
64
                if (readVal < (uint8_t)0x20)
67
65
                {
68
 
                        WPD_DEBUG_MSG(("Offset: %i, Handling Control Character 0x%2x\n", input->tell(), readVal));                      
 
66
                        WPD_DEBUG_MSG(("Offset: %i, Handling Control Character 0x%2x\n", (unsigned int)input->tell(), readVal));                        
69
67
 
70
68
                        switch (readVal)
71
69
                        {
96
94
                }
97
95
                else if (readVal >= (uint8_t)0x80 && readVal <= (uint8_t)0xBF)
98
96
                {
99
 
                        WPD_DEBUG_MSG(("Offset: %i, Handling Single Character Function 0x%2x\n", input->tell(), readVal));                      
 
97
                        WPD_DEBUG_MSG(("Offset: %i, Handling Single Character Function 0x%2x\n", (unsigned int)input->tell(), readVal));                        
100
98
 
101
99
                        // single character function codes
102
100
                        switch (readVal)
171
169
                else if (readVal >= (uint8_t)0xC0 && readVal <= (uint8_t)0xFE)
172
170
                {
173
171
                        WP1Part *part = WP1Part::constructPart(input, readVal);
174
 
                        if (part != NULL)
 
172
                        if (part)
175
173
                        {
176
174
                                part->parse(listener);
177
175
                                DELETEP(part);