diff options
| author | Florian Reuter <freuter@novell.com> | 2010-09-14 16:12:59 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-09-14 16:12:59 +0200 |
| commit | 95684c99842455d9dc8e9372b829a63c22f71535 (patch) | |
| tree | bdbe5cfda9dcd338977c2d0548ccb2b6144b9c5a /sw | |
| parent | 6bbe6e56c966c7896793dbd26d7b05a13d228403 (diff) | |
sw-import-html-controls.diff:
n#485609
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index c87035f208a1..beb29b02adfa 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1581,6 +1581,8 @@ public: // eigentlich private, geht aber leider nur public eF_ResT Read_F_OCX(WW8FieldDesc*, String&); eF_ResT Read_F_Hyperlink(WW8FieldDesc*, String& rStr); eF_ResT Read_F_Shape(WW8FieldDesc* pF, String& rStr); + eF_ResT Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr); + void DeleteFormImpl(); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 75454dddbc58..00768d0ef470 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -321,6 +321,14 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) } } +eF_ResT SwWW8ImplReader::Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr) +{ + if( bObj && nPicLocFc ) + nObjLocFc = nPicLocFc; + bEmbeddObj = true; + return FLD_TEXT; +} + void SwWW8ImplReader::DeleteFormImpl() { delete pFormImpl, pFormImpl = 0; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 93a39b1c390c..3cbddde5d52b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -908,7 +908,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) &SwWW8ImplReader::Read_F_Hyperlink, // 88 0, // 89 0, // 90 - 0, // 91 + &SwWW8ImplReader::Read_F_HTMLControl, // 91 0, // 92 0, // 93 0, // 94 |