← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/lib/WP42StylesListener.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/WP42StylesListener.cpp
33
33
WP42StylesListener::WP42StylesListener(std::list<WPXPageSpan> &pageList, std::vector<WP42SubDocument *> &subDocuments) : 
34
34
        WP42Listener(),
35
35
        WPXStylesListener(pageList),
36
 
        m_subDocuments(subDocuments),
37
36
        m_currentPage(WPXPageSpan()),
38
37
        m_nextPage(WPXPageSpan()),
39
 
        m_pageListHardPageMark(m_pageList.end()),
 
38
        m_subDocuments(subDocuments),
40
39
        m_tempMarginLeft(1.0f),
41
40
        m_tempMarginRight(1.0f),
 
41
        m_currentPageHasContent(false),
42
42
        m_isSubDocument(false),
43
 
        m_currentPageHasContent(false)
 
43
        m_pageListHardPageMark(m_pageList.end())
44
44
{
45
45
}
46
46
 
89
89
                                else
90
90
                                {
91
91
                                        m_currentPage.setHeaderFooter((*HFiter).getType(), (*HFiter).getInternalType(),
92
 
                                                (*HFiter).getOccurence(), NULL, (*HFiter).getTableList());
 
92
                                                (*HFiter).getOccurence(), 0, (*HFiter).getTableList());
93
93
                                }       
94
94
                        }
95
95
                        m_nextPage = WPXPageSpan();
146
146
                                _handleSubDocument(subDocument, true, tableList);
147
147
                        }
148
148
                        else
149
 
                                m_currentPage.setHeaderFooter(wpxType, headerFooterType, wpxOccurence, NULL, tableList);
 
149
                                m_currentPage.setHeaderFooter(wpxType, headerFooterType, wpxOccurence, 0, tableList);
150
150
                }
151
151
                m_currentPageHasContent = tempCurrentPageHasContent;
152
152
        }
179
179
        }
180
180
}
181
181
 
182
 
void WP42StylesListener::_handleSubDocument(const WPXSubDocument *subDocument, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice)
 
182
void WP42StylesListener::_handleSubDocument(const WPXSubDocument *subDocument, const bool isHeaderFooter,
 
183
                                                WPXTableList /* tableList */, int /* nextTableIndice */)
183
184
{
184
185
        if (!isUndoOn()) 
185
186
        {