diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-09-17 11:46:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-23 13:32:11 +0100 |
| commit | c4498251cb7181a9f272b0720f398597c0daef09 (patch) | |
| tree | 6a2baa2246986a43eef532e472e7f70a4d76cfc7 /sw/source/filter/ww8/ww8par.hxx | |
| parent | e2d8e4716ae1276e750139d4e292c198f03228ec (diff) | |
Resolves: #i119963#, #i120877# import and export actual TOC content
Patch by: zhengfan, Oliver
Review by: Oliver
reintegrate from branch writer001
(cherry picked from commit 8f2a21eac4a904db3cc4c448179e2d2cf5878ef4)
Conflicts:
sw/inc/tox.hxx
sw/source/core/tox/tox.cxx
sw/source/filter/ww8/dump/ww8scan.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
Change-Id: I75b2971f23754afa0bcb0b549bfb820dd5924b3b
Diffstat (limited to 'sw/source/filter/ww8/ww8par.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index ffe4317e8112..30ae35f87300 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -974,6 +974,7 @@ struct WW8TabBandDesc //----------------------------------------- // Storage-Reader //----------------------------------------- +typedef std::set<WW8_CP> cp_set; typedef std::vector<WW8_CP> cp_vector; class SwWW8ImplReader @@ -1276,6 +1277,16 @@ private: bool bBidi; bool bReadTable; boost::shared_ptr<SwPaM> mpTableEndPaM; + // Indicate that currently on loading a TOC, managed by Read_F_TOX() and End_Field() + bool mbLoadingTOCCache; + // Indicate that current on loading a hyperlink, which is inside a TOC; Managed by Read_F_Hyperlink() and End_Field() + bool mbLoadingTOCHyperlink; + // a document position recorded the after-position of TOC section, managed by Read_F_TOX() and End_Field() + SwPaM* mpPosAfterTOC; + + bool mbCareFirstParaEndInToc; + bool mbCareLastParaEndInToc; + cp_set maTOXEndCps; cp_vector maEndParaPos; WW8_CP maCurrAttrCP; |