Author: orw
Date: Wed Aug 28 11:28:20 2013
New Revision: 1518167
URL: http://svn.apache.org/r1518167
Log:
122867: HTML export - correct function pointer table which holds the export
functions for certain attributes
cherry-picked from trunk
Modified:
openoffice/branches/AOO401/ (props changed)
openoffice/branches/AOO401/main/sw/source/filter/html/css1atr.cxx
Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1517535
Modified: openoffice/branches/AOO401/main/sw/source/filter/html/css1atr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/sw/source/filter/html/css1atr.cxx?rev=1518167&r1=1518166&r2=1518167&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/sw/source/filter/html/css1atr.cxx (original)
+++ openoffice/branches/AOO401/main/sw/source/filter/html/css1atr.cxx Wed Aug
28 11:28:20 2013
@@ -3744,6 +3744,8 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_CHRATR_OVERLINE */ OutCSS1_SvxOverline,
/* RES_CHRATR_DUMMY1 */ 0,
/* RES_CHRATR_DUMMY2 */ 0,
+/* RES_CHRATR_BIDIRTL */ 0,
+/* RES_CHRATR_IDCTHINT */ 0,
/* RES_TXTATR_REFMARK */ 0,
/* RES_TXTATR_TOXMARK */ 0,
@@ -3773,9 +3775,9 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_HYPHENZONE*/ 0,
/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
-/* RES_PARATR_NUMRULE */ 0, // Dummy:
-/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
-/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_NUMRULE */ 0,
+/* RES_PARATR_SCRIPTSPACE */ 0,
+/* RES_PARATR_HANGINGPUNCTUATION */ 0,
/* RES_PARATR_FORBIDDEN_RULES */ 0, // new
/* RES_PARATR_VERTALIGN */ 0, // new
/* RES_PARATR_SNAPTOGRID*/ 0, // new
@@ -3822,13 +3824,13 @@ 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_GRFATR_MIRRORGRF */ 0,
/* RES_GRFATR_CROPGRF */ 0,
