diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 14:54:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 14:54:37 +0000 |
| commit | 56d04daf5030076ac0d3bb4ffe22145cc41c7ed4 (patch) | |
| tree | d1637b5b089da79cef08bee2ed427b74a65fc8a2 /sw/source | |
| parent | c3b72eb75431c802f22b24b3e78617f2390cfd9d (diff) | |
INTEGRATION: CWS aig04 (1.113.12); FILE MERGED
2003/06/24 09:33:46 cmc 1.113.12.2: #108791# ver 8+ im/export of dropdown lists
2003/06/24 07:49:03 cmc 1.113.12.1: #110412# fix exporting fullwidth tables
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 70079e6aa962..ce43cce8d05a 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par.hxx,v $ * - * $Revision: 1.114 $ + * $Revision: 1.115 $ * - * last change: $Author: hr $ $Date: 2003-06-30 15:00:37 $ + * last change: $Author: hr $ $Date: 2003-06-30 15:54:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -508,11 +508,14 @@ class WW8FormulaControl : public OCX_Control { public: WW8FormulaControl(const String& sN,SwWW8ImplReader &rR) - : OCX_Control(sN), rRdr(rR), fToolTip(0), fNoMark(0), fUseSize(0), - fNumbersOnly(0), fDateOnly(0), fUnused(0), nSize(0), hpsCheckBox(20), - nChecked(0) + : OCX_Control(sN), rRdr(rR), fUnknown(0), fDropdownIndex(0), + fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0), + fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0) { } + UINT8 fUnknown:2; + UINT8 fDropdownIndex:6; + UINT8 nDefaultChecked; UINT8 fToolTip:1; UINT8 fNoMark:1; UINT8 fUseSize:1; @@ -1009,7 +1012,7 @@ friend class wwSectionManager; void GetNoninlineNodeAttribs(const SwTxtNode *pNode, std::vector<const xub_StrLen*> &rPositions); - void Read_HdFt(BYTE nWhichItems, int nSect, SwPageDesc* pPD, + void Read_HdFt(BYTE nWhichItems, BYTE grpfIhdt, int nSect, SwPageDesc* pPD, const SwPageDesc *pPrev); void Read_HdFtText(long nStartCp, long nLen, SwFrmFmt* pHdFtFmt); |