diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-09-08 10:32:52 +0200 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-09-08 11:23:43 +0200 |
commit | bf98269524920077547e1b85aac1d593fc49fd16 (patch) | |
tree | d0060983d1b1cc9b060e6d4f90ecebf3fdb0afa7 /sw | |
parent | 58e4ff203e8f2703ab9433a3f49861ab306c8e4b (diff) |
Update attribute table of html filter
If these lists are not updated with new hintids,
it can break the filters.
Change-Id: I5f5408679cbfbf0922d7926de16122c0d21fc5e3
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 12 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 31 |
2 files changed, 25 insertions, 18 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 4fae564d225a..03fde66e46ba 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3724,13 +3724,15 @@ SwAttrFnTab aCSS1AttrFnTab = { /* RES_COLUMNBALANCE */ 0, /* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection, /* RES_HEADER_FOOTER_EAT_SPACING */ 0, -/* RES_FRMATR_DUMMY9 */ 0, // Dummy: +/* RES_ROW_SPLIT */ 0, /* RES_FOLLOW_TEXT_FLOW */ 0, +/* RES_COLLAPSING_BORDERS */ 0, /* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0, -/* RES_FRMATR_DUMMY2 */ 0, // Dummy: -/* RES_AUTO_STYLE */ 0, // Dummy: -/* RES_FRMATR_DUMMY4 */ 0, // Dummy: -/* RES_FRMATR_DUMMY5 */ 0, // Dummy: +/* RES_AUTO_STYLE */ 0, +/* RES_FRMATR_STYLE_NAME */ 0, +/* RES_FRMATR_CONDITIONAL_STYLE_NAME */ 0, +/* RES_FILL_STYLE */ 0, +/* RES_FILL_GRADIENT */ 0, /* RES_GRFATR_MIRRORGRF */ 0, /* RES_GRFATR_CROPGRF */ 0, diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index f2b7615542e6..9930a82616f3 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -3268,6 +3268,9 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_PARATR_VERTALIGN */ 0, // new /* RES_PARATR_SNAPTOGRID*/ 0, // new /* RES_PARATR_CONNECT_TO_BORDER */ 0, // new +/* RES_PARATR_OUTLINELEVEL */ 0, +/* RES_PARATR_RSID */ 0, +/* RES_PARATR_GRABBAG */ 0, /* RES_PARATR_LIST_ID */ 0, // new /* RES_PARATR_LIST_LEVEL */ 0, // new @@ -3301,21 +3304,23 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_URL */ 0, /* RES_EDIT_IN_READONLY */ 0, /* RES_LAYOUT_SPLIT */ 0, -/* RES_FRMATR_DUMMY1 */ 0, // Dummy: -/* RES_FRMATR_DUMMY2 */ 0, // Dummy: -/* RES_AUTO_STYLE */ 0, // Dummy: -/* RES_FRMATR_DUMMY4 */ 0, // Dummy: -/* RES_FRMATR_DUMMY5 */ 0, // Dummy: -/* RES_FRMATR_DUMMY6 */ 0, // Dummy: -/* RES_FRMATR_DUMMY7 */ 0, // Dummy: -/* RES_FRMATR_DUMMY8 */ 0, // Dummy: -/* RES_FRMATR_DUMMY9 */ 0, // Dummy: +/* RES_CHAIN */ 0, +/* RES_TEXTGRID */ 0, +/* RES_LINENUMBER */ 0, +/* RES_FTN_AT_TXTEND */ 0, +/* RES_END_AT_TXTEND */ 0, +/* RES_COLUMNBALANCE */ 0, +/* RES_FRAMEDIR */ 0, +/* RES_HEADER_FOOTER_EAT_SPACING */ 0, +/* RES_ROW_SPLIT */ 0, /* RES_FOLLOW_TEXT_FLOW */ 0, +/* RES_COLLAPSING_BORDERS */ 0, /* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0, -/* RES_FRMATR_DUMMY2 */ 0, // Dummy: -/* RES_AUTO_STYLE */ 0, // Dummy: -/* RES_FRMATR_DUMMY4 */ 0, // Dummy: -/* RES_FRMATR_DUMMY5 */ 0, // Dummy: +/* RES_AUTO_STYLE */ 0, +/* RES_FRMATR_STYLE_NAME */ 0, +/* RES_FRMATR_CONDITIONAL_STYLE_NAME */ 0, +/* RES_FILL_STYLE */ 0, +/* RES_FILL_GRADIENT */ 0, /* RES_GRFATR_MIRRORGRF */ 0, /* RES_GRFATR_CROPGRF */ 0, |