← Back to branch summary

~ubuntu-branches/ubuntu/karmic/libwpd/karmic

~ubuntu-branches/ubuntu/karmic/libwpd/karmic

« back to all changes in this revision

Viewing changes to src/lib/WP3ContentListener.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

files added:
build/win32/wpd2html.dsp

build/win32/wpd2raw.dsp

build/win32/wpd2text.dsp

src/conv/html/wpd2html.cpp

src/conv/raw/wpd2raw.cpp

src/conv/text/wpd2text.cpp

src/lib/WPXOLEStream.cpp

src/lib/WPXOLEStream.h

src/lib/WPXStreamImplementation.cpp

src/lib/WPXStreamImplementation.h

files removed:
src/conv/html/main.cpp

src/conv/raw/main.cpp

src/conv/text/main.cpp

files modified:
CHANGES

CREDITS

Makefile.in

autopackage/Makefile.in

build/Makefile.in

build/win32/Makefile.am

build/win32/Makefile.in

build/win32/libwpd.dsp

build/win32/libwpd.dsw

build/win32/libwpdstream.dsp

configure

configure.in

debian/changelog

debian/rules

docs/Makefile.in

docs/doxygen/Makefile.in

docs/doxygen/doxygen.cfg

libwpd.spec

libwpd.spec.in

src/Makefile.in

src/conv/Makefile.in

src/conv/html/Makefile.am

src/conv/html/Makefile.in

src/conv/raw/Makefile.am

src/conv/raw/Makefile.in

src/conv/raw/RawListener.cpp

src/conv/text/Makefile.am

src/conv/text/Makefile.in

src/conv/text/TextListenerImpl.h

src/lib/GSFStream.cpp

src/lib/GSFStream.h

src/lib/Makefile.am

src/lib/Makefile.in

src/lib/WP1ContentListener.cpp

src/lib/WP1ContentListener.h

src/lib/WP1FootnoteEndnoteGroup.h

src/lib/WP1HeaderFooterGroup.h

src/lib/WP1Heuristics.cpp

src/lib/WP1SetTabsGroup.cpp

src/lib/WP1StylesListener.cpp

src/lib/WP1VariableLengthGroup.cpp

src/lib/WP3ContentListener.cpp

src/lib/WP3ContentListener.h

src/lib/WP3DefinitionGroup.cpp

src/lib/WP3DisplayGroup.cpp

src/lib/WP3FontGroup.cpp

src/lib/WP3FootnoteEndnoteGroup.h

src/lib/WP3HeaderFooterGroup.cpp

src/lib/WP3HeaderFooterGroup.h

src/lib/WP3PageFormatGroup.cpp

src/lib/WP3StylesListener.h

src/lib/WP3TablesGroup.cpp

src/lib/WP3UndoGroup.cpp

src/lib/WP3VariableLengthGroup.cpp

src/lib/WP42ContentListener.cpp

src/lib/WP42ContentListener.h

src/lib/WP42HeaderFooterGroup.h

src/lib/WP42Heuristics.cpp

src/lib/WP42StylesListener.cpp

src/lib/WP5AttributeGroup.cpp

src/lib/WP5AttributeGroup.h

src/lib/WP5ContentListener.cpp

src/lib/WP5ContentListener.h

src/lib/WP5DefinitionGroup.h

src/lib/WP5ExtendedCharacterGroup.cpp

src/lib/WP5FontNameStringPoolPacket.cpp

src/lib/WP5FootnoteEndnoteGroup.h

src/lib/WP5HeaderFooterGroup.cpp

src/lib/WP5HeaderFooterGroup.h

src/lib/WP5ListFontsUsedPacket.cpp

src/lib/WP5ListFontsUsedPacket.h

src/lib/WP5Listener.h

src/lib/WP5PageFormatGroup.cpp

src/lib/WP5Parser.cpp

src/lib/WP5PrefixData.cpp

src/lib/WP5StylesListener.cpp

src/lib/WP5StylesListener.h

src/lib/WP5VariableLengthGroup.cpp

src/lib/WP61Header.cpp

src/lib/WP6AttributeGroup.cpp

src/lib/WP6CharacterGroup.cpp

src/lib/WP6CharacterGroup.h

src/lib/WP6ColumnGroup.cpp

src/lib/WP6ContentListener.cpp

src/lib/WP6ContentListener.h

src/lib/WP6DefaultInitialFontPacket.cpp

src/lib/WP6EOLGroup.cpp

src/lib/WP6EOLGroup.h

src/lib/WP6ExtendedDocumentSummaryPacket.cpp

src/lib/WP6ExtendedDocumentSummaryPacket.h

src/lib/WP6FileStructure.h

src/lib/WP6FillStylePacket.cpp

src/lib/WP6FontDescriptorPacket.cpp

src/lib/WP6FontDescriptorPacket.h

src/lib/WP6GeneralTextPacket.h

src/lib/WP6Header.cpp

src/lib/WP6HeaderFooterGroup.cpp

src/lib/WP6HighlightGroup.cpp

src/lib/WP6Listener.h

src/lib/WP6OutlineStylePacket.cpp

src/lib/WP6OutlineStylePacket.h

src/lib/WP6PageGroup.cpp

src/lib/WP6ParagraphGroup.cpp

src/lib/WP6ParagraphGroup.h

src/lib/WP6PrefixData.cpp

src/lib/WP6StyleGroup.cpp

src/lib/WP6StyleGroup.h

src/lib/WP6StylesListener.cpp

src/lib/WP6StylesListener.h

src/lib/WP6UndoGroup.cpp

src/lib/WP6VariableLengthGroup.cpp

src/lib/WP6VariableLengthGroup.h

src/lib/WPXContentListener.cpp

src/lib/WPXContentListener.h

src/lib/WPXHLListenerImpl.h

src/lib/WPXPageSpan.cpp

src/lib/WPXPageSpan.h

src/lib/WPXProperty.cpp

src/lib/WPXPropertyList.cpp

src/lib/WPXPropertyList.h

src/lib/WPXPropertyListVector.cpp

src/lib/WPXString.cpp

src/lib/WPXTable.cpp

src/lib/WPXTable.h

src/lib/libwpd_internal.cpp

src/lib/libwpd_internal.h

src/lib/makefile.mk

src/test/Makefile.in

src/test/test.cpp

Show diffs side-by-side

added added

removed removed

src/lib/WP3ContentListener.cpp

33

33

_WP3ContentParsingState::_WP3ContentParsingState():

34

34

m_colSpan(1),

35

35

m_rowSpan(1),

36

m_cellFillColor(0)

36

m_textBuffer(),

37

m_cellFillColor(0),

38

m_noteReference(),

39

m_tableList()

37

40

{

38

m_textBuffer.clear();

39

m_noteReference.clear();

40

41

}

41

42

42

43

_WP3ContentParsingState::~_WP3ContentParsingState()

43

44

{

44

m_textBuffer.clear();

45

m_noteReference.clear();

46

45

DELETEP(m_cellFillColor);

47

46

}

48

47

140

139

m_ps->m_tableDefinition.m_leftOffset = _movePositionToFirstColumn( (float)((double)leftOffset / (double)WPX_NUM_WPUS_PER_INCH) ) - m_ps->m_paragraphMarginLeft;

141

140

142

141

// remove all the old column information

143

m_ps->m_tableDefinition.columns.clear();

144

m_ps->m_tableDefinition.columnsProperties.clear();

142

m_ps->m_tableDefinition.m_columns.clear();

143

m_ps->m_tableDefinition.m_columnsProperties.clear();

145

144

m_ps->m_numRowsToSkip.clear();

146

145

}

147

146

}

158

157

colDef.m_rightGutter = (float)((double)width / (double)WPX_NUM_WPUS_PER_INCH);

159

158

160

159

// add the new column definition to our table definition

161

m_ps->m_tableDefinition.columns.push_back(colDef);

160

m_ps->m_tableDefinition.m_columns.push_back(colDef);

162

161

163

162

WPXColumnProperties colProp;

164

163

colProp.m_attributes = attributes;

165

164

colProp.m_alignment = alignment;

166

165

167

m_ps->m_tableDefinition.columnsProperties.push_back(colProp);

166

m_ps->m_tableDefinition.m_columnsProperties.push_back(colProp);

168

167

169

168

// initialize the variable that tells us how many columns to skip

170

169

m_ps->m_numRowsToSkip.push_back(0);

Older »