sw/source/filter/html/css1atr.cxx | 6 ++++--
sw/source/filter/html/htmlatr.cxx | 8 +++++---
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 08b0443e0f50f79ee26fad4eada0190623b9b30a
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Feb 16 20:12:46 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Feb 17 16:01:48 2023 +0000
sw: adapt aCSS1AttrFnTab to hintids.hxx
static_assert there is worthless because SwAttrFnTab is fixed size.
Change-Id: I9781027081c28a1c725bed510a768103dc53ccc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147208
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 28c5cc5dea8f..4180e94702d8 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3563,6 +3563,7 @@ SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection,
/* RES_HEADER_FOOTER_EAT_SPACING */ nullptr,
/* RES_ROW_SPLIT */ nullptr,
+/* RES_FLY_SPLIT */ nullptr,
/* RES_FOLLOW_TEXT_FLOW */ nullptr,
/* RES_COLLAPSING_BORDERS */ nullptr,
/* RES_WRAP_INFLUENCE_ON_OBJPOS */ nullptr,
@@ -3571,6 +3572,9 @@ SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_FRMATR_CONDITIONAL_STYLE_NAME */ nullptr,
/* RES_FRMATR_GRABBAG */ nullptr,
/* RES_TEXT_VERT_ADJUST */ nullptr,
+/* RES_BACKGROUND_FULL_SIZE */ nullptr,
+/* RES_RTL_GUTTER */ nullptr,
+/* RES_DECORATIVE */ nullptr,
/* RES_GRFATR_MIRRORGRF */ nullptr,
/* RES_GRFATR_CROPGRF */ nullptr,
@@ -3584,8 +3588,6 @@ SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_GRFATR_INVERT */ nullptr,
/* RES_GRFATR_TRANSPARENCY */ nullptr,
/* RES_GRFATR_DRWAMODE */ nullptr,
-/* RES_GRFATR_DUMMY1 */ nullptr,
-/* RES_GRFATR_DUMMY2 */ nullptr,
/* RES_GRFATR_DUMMY3 */ nullptr,
/* RES_GRFATR_DUMMY4 */ nullptr,
/* RES_GRFATR_DUMMY5 */ nullptr,
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 6584e8a0e279..3b05399e2bea 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3285,8 +3285,8 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_PARATR_LINESPACING */ nullptr,
/* RES_PARATR_ADJUST */ OutHTML_SvxAdjust,
/* RES_PARATR_SPLIT */ nullptr,
-/* RES_PARATR_WIDOWS */ nullptr,
/* RES_PARATR_ORPHANS */ nullptr,
+/* RES_PARATR_WIDOWS */ nullptr,
/* RES_PARATR_TABSTOP */ nullptr,
/* RES_PARATR_HYPHENZONE*/ nullptr,
/* RES_PARATR_DROP */ OutHTML_CSS1Attr,
@@ -3343,6 +3343,7 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_FRAMEDIR */ nullptr,
/* RES_HEADER_FOOTER_EAT_SPACING */ nullptr,
/* RES_ROW_SPLIT */ nullptr,
+/* RES_FLY_SPLIT */ nullptr,
/* RES_FOLLOW_TEXT_FLOW */ nullptr,
/* RES_COLLAPSING_BORDERS */ nullptr,
/* RES_WRAP_INFLUENCE_ON_OBJPOS */ nullptr,
@@ -3351,6 +3352,9 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_FRMATR_CONDITIONAL_STYLE_NAME */ nullptr,
/* RES_FRMATR_GRABBAG */ nullptr,
/* RES_TEXT_VERT_ADJUST */ nullptr,
+/* RES_BACKGROUND_FULL_SIZE */ nullptr,
+/* RES_RTL_GUTTER */ nullptr,
+/* RES_DECORATIVE */ nullptr,
/* RES_GRFATR_MIRRORGRF */ nullptr,
/* RES_GRFATR_CROPGRF */ nullptr,
@@ -3364,8 +3368,6 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_GRFATR_INVERT */ nullptr,
/* RES_GRFATR_TRANSPARENCY */ nullptr,
/* RES_GRFATR_DRWAMODE */ nullptr,
-/* RES_GRFATR_DUMMY1 */ nullptr,
-/* RES_GRFATR_DUMMY2 */ nullptr,
/* RES_GRFATR_DUMMY3 */ nullptr,
/* RES_GRFATR_DUMMY4 */ nullptr,
/* RES_GRFATR_DUMMY5 */ nullptr,
