~ubuntu-branches/ubuntu/jaunty/libwpd/jaunty

« back to all changes in this revision

Viewing changes to src/lib/WP1StylesListener.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:
25
25
 */
26
26
 
27
27
#include "WP1StylesListener.h"
28
 
#include "WPXTable.h"
29
28
#include "WP1FileStructure.h"
30
29
#include "WPXFileStructure.h"
31
30
#include "libwpd_internal.h"
33
32
WP1StylesListener::WP1StylesListener(std::list<WPXPageSpan> &pageList, std::vector<WP1SubDocument *> &subDocuments) : 
34
33
        WP1Listener(),
35
34
        WPXStylesListener(pageList),
36
 
        m_subDocuments(subDocuments),
37
35
        m_currentPage(WPXPageSpan()),
38
36
        m_nextPage(WPXPageSpan()),
39
 
        m_pageListHardPageMark(m_pageList.end()),
 
37
        m_subDocuments(subDocuments),
40
38
        m_tempMarginLeft(1.0f),
41
39
        m_tempMarginRight(1.0f),
 
40
        m_currentPageHasContent(false),
42
41
        m_isSubDocument(false),
43
 
        m_currentPageHasContent(false)
 
42
        m_pageListHardPageMark(m_pageList.end())
44
43
{
45
44
}
46
45
 
89
88
                                else
90
89
                                {
91
90
                                        m_currentPage.setHeaderFooter((*HFiter).getType(), (*HFiter).getInternalType(),
92
 
                                                (*HFiter).getOccurence(), NULL, (*HFiter).getTableList());
 
91
                                                (*HFiter).getOccurence(), 0, (*HFiter).getTableList());
93
92
                                }       
94
93
                        }
95
94
                        m_nextPage = WPXPageSpan();
213
212
                                _handleSubDocument(subDocument, true, tableList);
214
213
                        }
215
214
                        else
216
 
                                m_currentPage.setHeaderFooter(wpxType, headerFooterType, wpxOccurence, NULL, tableList);
 
215
                                m_currentPage.setHeaderFooter(wpxType, headerFooterType, wpxOccurence, 0, tableList);
217
216
                }
218
217
                m_currentPageHasContent = tempCurrentPageHasContent;
219
218
        }
241
240
        }
242
241
}
243
242
 
244
 
void WP1StylesListener::_handleSubDocument(const WPXSubDocument *subDocument, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice)
 
243
void WP1StylesListener::_handleSubDocument(const WPXSubDocument *subDocument, const bool isHeaderFooter,
 
244
                                                WPXTableList /* tableList */, int /* nextTableIndice */)
245
245
{
246
246
        if (!isUndoOn()) 
247
247
        {