~ubuntu-branches/ubuntu/trusty/libwpd/trusty

« back to all changes in this revision

Viewing changes to src/lib/WPDocument.cpp

Committer: Bazaar Package Importer
Author(s): Rene Engelhard
Date: 2006-07-15 11:58:12 UTC
mfrom: (1.1.5 upstream)
Revision ID: james.westby@ubuntu.com-20060715115812-v18efmdayby4clau

Tags: 0.8.6-1

* New upstream release
* swap maintainer/uploader

files added:
src/lib/WP42HeaderFooterGroup.cpp

src/lib/WP42HeaderFooterGroup.h

src/lib/WP42MarginResetGroup.cpp

src/lib/WP42MarginResetGroup.h

src/lib/WP42MultiByteFunctionGroup.cpp

src/lib/WP42MultiByteFunctionGroup.h

src/lib/WP42SubDocument.cpp

src/lib/WP42SubDocument.h

src/lib/WP42SuppressPageCharacteristicsGroup.cpp

src/lib/WP42SuppressPageCharacteristicsGroup.h

src/lib/WP42UnsupportedMultiByteFunctionGroup.cpp

src/lib/WP42UnsupportedMultiByteFunctionGroup.h

files removed:
debian/patches

debian/patches/00list

debian/patches/01_wp5nofontlistcrash.dpatch

src/lib/WP42UnsupportedVariableLengthGroup.cpp

src/lib/WP42UnsupportedVariableLengthGroup.h

src/lib/WP42VariableLengthGroup.cpp

src/lib/WP42VariableLengthGroup.h

files modified:
CHANGES

CREDITS

Makefile.in

aclocal.m4

autopackage/Makefile.in

build/Makefile.in

build/win32/Makefile.in

build/win32/libwpd.dsp

configure

configure.in

debian/changelog

debian/control

depcomp

docs/Makefile.in

docs/doxygen/Makefile.in

install-sh

libwpd.spec

ltmain.sh

missing

src/Makefile.in

src/conv/Makefile.in

src/conv/html/Makefile.in

src/conv/html/main.cpp

src/conv/raw/Makefile.in

src/conv/raw/main.cpp

src/conv/text/Makefile.in

src/conv/text/main.cpp

src/lib/Makefile.am

src/lib/Makefile.in

src/lib/WP3AttributeGroup.h

src/lib/WP3ContentListener.cpp

src/lib/WP3ContentListener.h

src/lib/WP3DefinitionGroup.h

src/lib/WP3DisplayGroup.h

src/lib/WP3EndOfLinePageGroup.h

src/lib/WP3ExtendedCharacterGroup.h

src/lib/WP3FixedLengthGroup.cpp

src/lib/WP3FixedLengthGroup.h

src/lib/WP3FontGroup.h

src/lib/WP3FootnoteEndnoteGroup.h

src/lib/WP3Header.h

src/lib/WP3HeaderFooterGroup.cpp

src/lib/WP3HeaderFooterGroup.h

src/lib/WP3Listener.cpp

src/lib/WP3Listener.h

src/lib/WP3MiscellaneousGroup.h

src/lib/WP3PageFormatGroup.h

src/lib/WP3Parser.h

src/lib/WP3Part.cpp

src/lib/WP3Part.h

src/lib/WP3SingleByteFunction.h

src/lib/WP3StylesListener.cpp

src/lib/WP3StylesListener.h

src/lib/WP3TablesGroup.h

src/lib/WP3UndoGroup.h

src/lib/WP3UnsupportedFixedLengthGroup.h

src/lib/WP3UnsupportedVariableLengthGroup.h

src/lib/WP3VariableLengthGroup.cpp

src/lib/WP3VariableLengthGroup.h

src/lib/WP42ContentListener.cpp

src/lib/WP42ContentListener.h

src/lib/WP42FileStructure.cpp

src/lib/WP42FileStructure.h

src/lib/WP42Heuristics.cpp

src/lib/WP42Listener.cpp

src/lib/WP42Listener.h

src/lib/WP42Parser.cpp

src/lib/WP42Parser.h

src/lib/WP42Part.cpp

src/lib/WP42Part.h

src/lib/WP42StylesListener.cpp

src/lib/WP42StylesListener.h

src/lib/WP5AttributeGroup.h

src/lib/WP5ContentListener.cpp

src/lib/WP5ContentListener.h

src/lib/WP5DefinitionGroup.cpp

src/lib/WP5DefinitionGroup.h

src/lib/WP5ExtendedCharacterGroup.h

src/lib/WP5FixedLengthGroup.cpp

src/lib/WP5FixedLengthGroup.h

src/lib/WP5FontGroup.cpp

src/lib/WP5FontGroup.h

src/lib/WP5FootnoteEndnoteGroup.h

src/lib/WP5GeneralPacketIndex.cpp

src/lib/WP5Header.h

src/lib/WP5HeaderFooterGroup.cpp

src/lib/WP5HeaderFooterGroup.h

src/lib/WP5ListFontsUsedPacket.h

src/lib/WP5Listener.cpp

src/lib/WP5Listener.h

src/lib/WP5PageFormatGroup.h

src/lib/WP5Parser.cpp

src/lib/WP5Parser.h

src/lib/WP5Part.cpp

src/lib/WP5Part.h

src/lib/WP5PrefixData.cpp

src/lib/WP5SingleByteFunction.h

src/lib/WP5StylesListener.cpp

src/lib/WP5StylesListener.h

src/lib/WP5SubDocument.h

src/lib/WP5TableEOLGroup.h

src/lib/WP5TableEOPGroup.h

src/lib/WP5UnsupportedFixedLengthGroup.h

src/lib/WP5UnsupportedVariableLengthGroup.h

src/lib/WP5VariableLengthGroup.cpp

src/lib/WP5VariableLengthGroup.h

src/lib/WP60Header.h

src/lib/WP61Header.h

src/lib/WP6AttributeGroup.h

src/lib/WP6CharacterGroup.cpp

src/lib/WP6CharacterGroup.h

src/lib/WP6ColumnGroup.h

src/lib/WP6ContentListener.cpp

src/lib/WP6ContentListener.h

src/lib/WP6DefaultInitialFontPacket.h

src/lib/WP6DisplayNumberReferenceGroup.h

src/lib/WP6EOLGroup.cpp

src/lib/WP6EOLGroup.h

src/lib/WP6ExtendedCharacterGroup.h

src/lib/WP6ExtendedDocumentSummaryPacket.cpp

src/lib/WP6ExtendedDocumentSummaryPacket.h

src/lib/WP6FillStylePacket.h

src/lib/WP6FixedLengthGroup.cpp

src/lib/WP6FixedLengthGroup.h

src/lib/WP6FontDescriptorPacket.h

src/lib/WP6FootnoteEndnoteGroup.h

src/lib/WP6GeneralTextPacket.cpp

src/lib/WP6GeneralTextPacket.h

src/lib/WP6HeaderFooterGroup.h

src/lib/WP6HighlightGroup.h

src/lib/WP6Listener.cpp

src/lib/WP6Listener.h

src/lib/WP6OutlineStylePacket.h

src/lib/WP6PageGroup.h

src/lib/WP6ParagraphGroup.h

src/lib/WP6Parser.cpp

src/lib/WP6Parser.h

src/lib/WP6Part.cpp

src/lib/WP6Part.h

src/lib/WP6PrefixDataPacket.cpp

src/lib/WP6SingleByteFunction.h

src/lib/WP6StyleGroup.h

src/lib/WP6StylesListener.cpp

src/lib/WP6StylesListener.h

src/lib/WP6TabGroup.cpp

src/lib/WP6TabGroup.h

src/lib/WP6UndoGroup.h

src/lib/WP6UnsupportedFixedLengthGroup.h

src/lib/WP6UnsupportedVariableLengthGroup.h

src/lib/WP6VariableLengthGroup.cpp

src/lib/WP6VariableLengthGroup.h

src/lib/WPDocument.cpp

src/lib/WPXContentListener.cpp

src/lib/WPXContentListener.h

src/lib/WPXHeader.cpp

src/lib/WPXListener.cpp

src/lib/WPXListener.h

src/lib/WPXMemoryStream.cpp

src/lib/WPXMemoryStream.h

src/lib/WPXProperty.cpp

src/lib/WPXStream.h

src/lib/WPXStylesListener.cpp

src/lib/WPXStylesListener.h

src/lib/WPXSubDocument.h

src/lib/WPXTable.cpp

src/lib/libwpd_internal.cpp

src/lib/libwpd_types.h

src/lib/makefile.mk

Show diffs side-by-side

added added

removed removed

src/lib/WPDocument.cpp

header = WPXHeader::constructHeader(document);

if (header)

{

100

switch (header->getMajorVersion())

100

switch (header->getFileType())

101

{

102

case 0x00: // WP5

103

case 0x02: // WP6

104

case 0x03: // WP Mac 3.0-3.5

105

case 0x04: // WP Mac 3.5e

106

confidence = WPD_CONFIDENCE_EXCELLENT;

102

case 0x0a: // WordPerfect File

103

switch (header->getMajorVersion())

104

{

105

case 0x00: // WP5

106

case 0x02: // WP6+

107

confidence = WPD_CONFIDENCE_EXCELLENT;

108

break;

109

default:

110

// unhandled file format

111

confidence = WPD_CONFIDENCE_NONE;

112

break;

113

}

114

break;

115

case 0x2c: // WP Mac File

116

switch (header->getMajorVersion())

117

{

118

case 0x02: // WP Mac 2.x

119

case 0x03: // WP Mac 3.0-3.5

120

case 0x04: // WP Mac 3.5e

121

confidence = WPD_CONFIDENCE_EXCELLENT;

122

break;

123

default:

124

// unhandled file format

125

confidence = WPD_CONFIDENCE_NONE;

126

break;

127

}

107

128

break;

108

129

default:

109

// unhandled file format

130

// unhandled file type

110

131

confidence = WPD_CONFIDENCE_NONE;

111

132

break;

112

}

133

}

113

134

DELETEP(header);

114

135

}

115

136

else

182

203

183

204

if (header)

184

205

{

185

switch (header->getMajorVersion())

206

switch (header->getFileType())

186

207

{

187

case 0x00: // WP5

188

WPD_DEBUG_MSG(("WordPerfect: Using the WP5 parser.\n"));

189

parser = new WP5Parser(document, header);

190

parser->parse(listenerImpl);

191

break;

192

case 0x02: // WP6

193

WPD_DEBUG_MSG(("WordPerfect: Using the WP6 parser.\n"));

194

parser = new WP6Parser(document, header);

195

parser->parse(listenerImpl);

196

break;

197

case 0x03: // WP Mac 3.0-3.5

198

case 0x04: // WP Mac 3.5e

199

WPD_DEBUG_MSG(("WordPerfect: Using the WP3 parser.\n"));

200

parser = new WP3Parser(document, header);

201

parser->parse(listenerImpl);

208

case 0x0a: // WordPerfect File

209

switch (header->getMajorVersion())

210

{

211

case 0x00: // WP5

212

WPD_DEBUG_MSG(("WordPerfect: Using the WP5 parser.\n"));

213

parser = new WP5Parser(document, header);

214

parser->parse(listenerImpl);

215

break;

216

case 0x02: // WP6

217

WPD_DEBUG_MSG(("WordPerfect: Using the WP6 parser.\n"));

218

parser = new WP6Parser(document, header);

219

parser->parse(listenerImpl);

220

break;

221

default:

222

// unhandled file format

223

WPD_DEBUG_MSG(("WordPerfect: Unsupported file format.\n"));

224

break;

225

}

226

break;

227

case 0x2c: // WP Mac File

228

switch (header->getMajorVersion())

229

{

230

case 0x02: // WP Mac 2.x

231

case 0x03: // WP Mac 3.0-3.5

232

case 0x04: // WP Mac 3.5e

233

WPD_DEBUG_MSG(("WordPerfect: Using the WP3 parser.\n"));

234

parser = new WP3Parser(document, header);

235

parser->parse(listenerImpl);

236

break;

237

default:

238

// unhandled file format

239

WPD_DEBUG_MSG(("WordPerfect: Unsupported file format.\n"));

240

break;

241

}

202

242

break;

203

243

default:

204

244

// unhandled file format

205

WPD_DEBUG_MSG(("WordPerfect: Unsupported file format.\n"));

245

WPD_DEBUG_MSG(("WordPerfect: Unsupported file type.\n"));

206

246

break;

207

247

}

208

248

216

256

// a file in the WP4.2 format.

217

257

int confidence = WP42Heuristics::isWP42FileFormat(document, false /* FIXME: allow for partial content */);

218

258

219

if (confidence == WPD_CONFIDENCE_GOOD || confidence == WPD_CONFIDENCE_EXCELLENT)

259

if (confidence != WPD_CONFIDENCE_NONE)

220

260

{

221

261

WPD_DEBUG_MSG(("WordPerfect: Mostly likely the file format is WP4.2.\n\n"));

222

262

WPD_DEBUG_MSG(("WordPerfect: Using the WP4.2 parser.\n\n"));

256

296

257

297

return error;

258

298

}

259

260

261

262

TOTALLY BROKEN, DO NOT USE!!!

263

I MEAN IT!

264

265

void WPDocument::parse(WPXInputStream *input, WPXHLListenerImpl *listenerImpl, WPXFileType fileType)

266

{

267

WPXParser *parser = NULL;

268

WPXHeader *header = NULL;

269

270

try

271

{

272

switch (fileType)

273

{

274

case WP42_DOCUMENT:

275

WPD_DEBUG_MSG(("WordPerfect: Using the WP42 parser.\n"));

276

parser = new WP42Parser(input);

277

parser->parse(listenerImpl);

278

DELETEP(parser);

279

break;

280

case WP5_DOCUMENT:

281

WPD_DEBUG_MSG(("WordPerfect: Using the WP5 parser.\n"));

282

header = new WPXHeader(input);

283

parser = new WP5Parser(input, header);

284

parser->parse(listenerImpl);

285

DELETEP(parser);

286

DELETEP(header);

287

break;

288

case WP6_DOCUMENT:

289

WPD_DEBUG_MSG(("WordPerfect: Using the WP6 parser.\n"));

290

header = new WPXHeader(input);

291

parser = new WP6Parser(input, header);

292

parser->parse(listenerImpl);

293

DELETEP(parser);

294

DELETEP(header);

295

break;

296

default:

297

// unhandled file format

298

WPD_DEBUG_MSG(("WordPerfect: Unsupported file format.\n"));

299

break;

300

}

301

}

302

catch (NoFileHeaderException)

303

{

304

// should not happen

305

DELETEP(parser);

306

DELETEP(header);

307

throw NoFileHeaderException();

308

}

309

catch (FileException)

310

{

311

DELETEP(parser);

312

DELETEP(header);

313

throw FileException();

314

}

315

}

316

317

318

319

320

321

TOTALLY BROKEN - MIGHT BE NICE TO HAVE

322

323

WPXFileType WPDocument::WPXParser::getFileType(WPXInputStream *input)

324

{

325

326

}*/

Older »