diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-04 12:37:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-04 19:12:40 +0100 |
| commit | 3a40e9d4b2338e8650c921ff4c8c2bb9e7cba33b (patch) | |
| tree | d17ce50b1015802465a9f14be5c7751035de75d4 /sw | |
| parent | 24f95d7e82b0c7896994ed12cac5ab022fc32267 (diff) | |
bnc#636128 DOC import: handle FFData.cch
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f)
Conflicts:
sw/source/filter/ww8/ww8par3.cxx
Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 696d10335408..a9cca6298ee9 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -625,7 +625,7 @@ public: WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rR) : rRdr(rR), fUnknown(0), fDropdownIndex(0), fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0), - fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN ) + fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), mnMaxLen(0), sName( rN ) { } sal_uInt8 fUnknown:2; @@ -642,6 +642,8 @@ public: sal_uInt16 nChecked; sal_uInt16 nDefaultChecked; + /// FFData.cch in the spec: maximum length, in characters, of the value of the textbox. + sal_uInt16 mnMaxLen; OUString sTitle; OUString sDefault; OUString sFormatting; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 25da90283bca..22e305ebf339 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -167,6 +167,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr ) maFieldStack.back().SetBookmarkType(ODF_FORMTEXT); maFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.sToolTip)); maFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.sTitle)); + if (aFormula.mnMaxLen) + maFieldStack.back().getParameters()["MaxLength"] = uno::makeAny(OUString::number(aFormula.mnMaxLen)); } return FLD_TEXT; } @@ -2199,7 +2201,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, sal_uInt8 iRes = (bits1 & 0x7C) >> 2; sal_uInt16 cch = 0; - *pDataStream >> cch; + *pDataStream >> mnMaxLen; sal_uInt16 hps = 0; *pDataStream >> hps; |