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

« back to all changes in this revision

Viewing changes to src/lib/WP6ExtendedDocumentSummaryPacket.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rene Engelhard
  • Date: 2007-06-15 13:28:41 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070615132841-00nybwftc708w96n
Tags: 0.8.10-1
* New upstream release
* bump shlibs for libwpd-stream8c2a 

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
 
66
66
        for (unsigned i=0; i < (unsigned)m_dataSize && !m_stream->atEOS(); i+=groupLength)
67
67
        {
68
 
                groupLength = readU16(m_stream);
69
 
                if ((groupLength <= 0) || m_stream->atEOS())
 
68
                try
 
69
                {
 
70
                        groupLength = readU16(m_stream);
 
71
                }
 
72
                catch (FileException)
 
73
                {
 
74
                        return;
 
75
                }
 
76
                if ((groupLength == 0) || m_stream->atEOS())
70
77
                        return;
71
78
                uint16_t tagID = readU16(m_stream);
72
79
                if (m_stream->atEOS())
90
97
                } 
91
98
                
92
99
                if (tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_CREATION_DATE ||
93
 
                    tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_DATE_COMPLETED)
 
100
                    tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_DATE_COMPLETED ||
 
101
                    tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_RECORDED_DATE ||
 
102
                    tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_REVISION_DATE ||
 
103
                    tagID == WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY_VERSION_DATE)
94
104
                {
95
 
                        uint16_t year = readU16(m_stream);
96
 
                        uint8_t month = readU8(m_stream);
97
 
                        uint8_t day = readU8(m_stream);
98
 
                        uint8_t hour = readU8(m_stream);
99
 
                        uint8_t minute = readU8(m_stream);
100
 
                        uint8_t second = readU8(m_stream);
101
 
                        uint8_t dayOfWeek = readU8(m_stream);
102
 
                        uint8_t timeZone = readU8(m_stream);
103
 
                        uint8_t unused = readU8(m_stream);
104
 
                        listener->setDate(year, month, day, hour, minute, second, dayOfWeek, timeZone, unused);
 
105
                        try
 
106
                        {
 
107
                                uint16_t year = readU16(m_stream);
 
108
                                uint8_t month = readU8(m_stream);
 
109
                                uint8_t day = readU8(m_stream);
 
110
                                uint8_t hour = readU8(m_stream);
 
111
                                uint8_t minute = readU8(m_stream);
 
112
                                uint8_t second = readU8(m_stream);
 
113
                                uint8_t dayOfWeek = readU8(m_stream);
 
114
                                uint8_t timeZone = readU8(m_stream);
 
115
                                uint8_t unused = readU8(m_stream);
 
116
                                listener->setDate(tagID, year, month, day, hour, minute, second, dayOfWeek, timeZone, unused);
 
117
                        }
 
118
                        catch (FileException)
 
119
                        {
 
120
                                return;
 
121
                        }
105
122
                }
106
123
                else
107
124
                {