sw/source/filter/html/htmlflyt.cxx | 392 ++++++++++++++++++-------------------
1 file changed, 195 insertions(+), 197 deletions(-)
New commits:
commit 173ce4548c0cfe6dd50904cb8a9323426a65feab
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 19 08:12:41 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 19 09:34:23 2023 +0200
Expand a macro inline
Change-Id: Icd1e63616af383c98b35d8bd70cf83b007f8473a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153242
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/filter/html/htmlflyt.cxx
b/sw/source/filter/html/htmlflyt.cxx
index 9f527796709b..ab0c5d2f7ed0 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -19,88 +19,86 @@
#include "htmlfly.hxx"
-#define TE(t,p,c) { HtmlOut::t, HtmlPosition::p, HtmlContainerFlags::c }
-
AllHtmlFlags const aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(Div, Prefix, NONE), // IE 4
- TE(Div, Prefix, NONE), // SW
- TE(Div, Prefix, NONE) // Netscape 4!
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE }
// Netscape 4!
},
{
// text frame with table and headline
- TE(Div, Prefix, NONE), // IE 4
- TE(Div, Prefix, NONE), // SW
- TE(Div, Prefix, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// column frame
- TE(GraphicFrame, Prefix, NONE), // IE 4
- TE(MultiCol, Prefix, NONE), // SW
- TE(MultiCol, Prefix, Div) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::MultiCol, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::MultiCol, HtmlPosition::Prefix, HtmlContainerFlags::Div
} // Netscape 4
},
{
// empty text frame
- TE(Div, Prefix, NONE), // IE 4
- TE(Div, Prefix, NONE), // SW
- TE(Div, Prefix, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other text frame
- TE(Div, Prefix, NONE), // IE 4
- TE(Div, Prefix, NONE), // SW
- TE(Div, Prefix, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Div, HtmlPosition::Prefix, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// graphic node
- TE(GraphicNode, Prefix, NONE), // IE 4
- TE(GraphicNode, Prefix, NONE), // SW
- TE(GraphicNode, Prefix, Span) // Netscape 4
+ { HtmlOut::GraphicNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::GraphicNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::GraphicNode, HtmlPosition::Prefix, HtmlContainerFlags::Span
} // Netscape 4
},
{
// plug-in
- TE(OleNode, Prefix, NONE), // IE 4
- TE(OleNode, Prefix, NONE), // SW
- TE(OleNode, Prefix, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::Span }
// Netscape 4
},
{
// applet
- TE(OleNode, Prefix, NONE), // IE 4
- TE(OleNode, Prefix, NONE), // SW
- TE(OleNode, Prefix, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::Span }
// Netscape 4
},
{
// floating frame
- TE(OleNode, Prefix, NONE), // IE 4
- TE(OleNode, Prefix, NONE), // SW
- TE(OleGraphic, Prefix, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleNode, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Prefix, HtmlContainerFlags::Span
} // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Prefix, NONE), // IE 4
- TE(OleGraphic, Prefix, NONE), // SW
- TE(OleGraphic, Prefix, Span) // Netscape 4
+ { HtmlOut::OleGraphic, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleGraphic, HtmlPosition::Prefix, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Prefix, HtmlContainerFlags::Span
} // Netscape 4
},
{
// marquee
- TE(AMarquee, Prefix, NONE), // IE 4
- TE(AMarquee, Prefix, NONE), // SW
- TE(GraphicFrame, Prefix, Span) // Netscape 4
+ { HtmlOut::AMarquee, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::AMarquee, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Prefix,
HtmlContainerFlags::Span } // Netscape 4
},
{
// controls
- TE(Control, Prefix, NONE), // IE 4
- TE(Control, Prefix, NONE), // SW
+ { HtmlOut::Control, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Control, HtmlPosition::Prefix, HtmlContainerFlags::NONE },
// SW
// Netscape disables FROM at controls in absolute position span.
- TE(Control, Inside, NONE) // Netscape 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Prefix, NONE), // IE 4
- TE(GraphicFrame, Prefix, NONE), // SW
- TE(GraphicFrame, Prefix, Span) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Prefix,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Prefix,
HtmlContainerFlags::Span } // Netscape 4
}
};
@@ -108,83 +106,83 @@ AllHtmlFlags const
aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Before, NONE), // IE 4
- TE(TableNode, Before, NONE), // SW
- TE(TableNode, Before, NONE) // Netscape 4
+ { HtmlOut::TableNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::TableNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::TableNode, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// text frame with table and headline
- TE(Div, Before, NONE), // IE 4
- TE(Div, Before, NONE), // SW
- TE(TableNode, Before, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::TableNode, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// column frame
- TE(GraphicFrame, Before, NONE), // IE 4
- TE(MultiCol, Before, NONE), // SW
- TE(MultiCol, Before, Div) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::MultiCol, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::MultiCol, HtmlPosition::Before, HtmlContainerFlags::Div
} // Netscape 4
},
{
// empty text frame
- TE(Div, Before, NONE), // IE 4
- TE(Spacer, Before, NONE), // SW
- TE(Spacer, Before, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Spacer, HtmlPosition::Before, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Spacer, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other text frame
- TE(Div, Before, NONE), // IE 4
- TE(Div, Before, NONE), // SW
- TE(Div, Before, NONE) // Netscape 4
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Div, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// graphic node
- TE(GraphicNode, Before, NONE), // IE 4
- TE(GraphicNode, Before, NONE), // SW
- TE(GraphicNode, Before, NONE) // Netscape 4
+ { HtmlOut::GraphicNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::GraphicNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::GraphicNode, HtmlPosition::Before, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// plug-in
- TE(OleNode, Before, NONE), // IE 4
- TE(OleNode, Before, NONE), // SW
- TE(OleNode, Before, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// applet
- TE(OleNode, Before, NONE), // IE 4
- TE(OleNode, Before, NONE), // SW
- TE(OleNode, Before, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// floating frame
- TE(OleNode, Before, NONE), // IE 4
- TE(OleNode, Before, NONE), // SW
- TE(OleGraphic, Before, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleNode, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Before, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Before, NONE), // IE 4
- TE(OleGraphic, Before, NONE), // SW
- TE(OleGraphic, Before, NONE) // Netscape 4
+ { HtmlOut::OleGraphic, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleGraphic, HtmlPosition::Before, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Before, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// marquee (for Netscape 4 in container, so that
// the marquee appears at the right spot)
- TE(AMarquee, Before, NONE), // IE 4
- TE(AMarquee, Before, NONE), // SW
- TE(GraphicFrame, Before, NONE) // Netscape 4
+ { HtmlOut::AMarquee, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::AMarquee, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Before,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// controls
- TE(Control, Before, NONE), // IE 4
- TE(Control, Before, NONE), // SW
+ { HtmlOut::Control, HtmlPosition::Before, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Control, HtmlPosition::Before, HtmlContainerFlags::NONE },
// SW
// here you could make container out if it (import is missing)
- TE(Control, Before, NONE) // Netscape 4
+ { HtmlOut::Control, HtmlPosition::Before, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Before, NONE), // IE 4
- TE(GraphicFrame, Before, NONE), // SW
- TE(GraphicFrame, Before, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Before,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Before,
HtmlContainerFlags::NONE } // Netscape 4
}
};
@@ -192,82 +190,82 @@ AllHtmlFlags const
aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Inside, NONE), // IE 4
- TE(TableNode, Inside, NONE), // SW
- TE(TableNode, Inside, NONE) // Netscape 4
+ { HtmlOut::TableNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::TableNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::TableNode, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// text frame with table and headline
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(MultiCol, Inside, NONE), // SW
- TE(MultiCol, Inside, Span) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::Span } // Netscape 4
},
{
// empty text frame
- TE(Span, Inside, NONE), // IE 4
- TE(Spacer, Inside, NONE), // SW
- TE(Spacer, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Spacer, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Spacer, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other text frame
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // IE 4
- TE(GraphicNode, Inside, NONE), // SW
- TE(GraphicNode, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// floating frame
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleGraphic, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // IE 4
- TE(OleGraphic, Inside, NONE), // SW
- TE(OleGraphic, Inside, NONE) // Netscape 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// marquee
- TE(AMarquee, Inside, NONE), // IE 4
- TE(AMarquee, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::AMarquee, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::AMarquee, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // IE 4
- TE(Control, Inside, NONE), // SW
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
// here you could make container out if it (import is missing)
- TE(Control, Inside, NONE) // Netscape 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
}
};
@@ -275,82 +273,82 @@ AllHtmlFlags const
aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// text frame with table and headline
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(MultiCol, Inside, NONE), // SW
- TE(MultiCol, Inside, Span) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::Span } // Netscape 4
},
{
// empty text frame
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other text frame
- TE(Span, Inside, NONE), // IE 4
- TE(Span, Inside, NONE), // SW
- TE(Span, Inside, NONE) // Netscape 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Span, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // IE 4
- TE(GraphicNode, Inside, NONE), // SW
- TE(GraphicNode, Inside, Span) // Netscape 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::Span
} // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::Span }
// Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::Span }
// Netscape 4
},
{
// floating frame
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleGraphic, Inside, Span) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::Span
} // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // IE 4
- TE(OleGraphic, Inside, NONE), // SW
- TE(OleGraphic, Inside, Span) // Netscape 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::Span
} // Netscape 4
},
{
// marquee
- TE(AMarquee, Inside, NONE), // IE 4
- TE(AMarquee, Inside, NONE), // SW
- TE(GraphicFrame, Inside, Span) // Netscape 4
+ { HtmlOut::AMarquee, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::AMarquee, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::Span } // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // IE 4
- TE(Control, Inside, NONE), // SW
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
// Netscape disables FROM at controls in absolute position span.
- TE(Control, Inside, NONE) // Netscape 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, Span) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::Span } // Netscape 4
}
};
@@ -358,82 +356,82 @@ AllHtmlFlags const
aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// text frame with table and headline
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(MultiCol, Inside, NONE), // SW
- TE(MultiCol, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::MultiCol, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(Spacer, Inside, NONE), // SW
- TE(Spacer, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::Spacer, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::Spacer, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // IE 4
- TE(GraphicNode, Inside, NONE), // SW
- TE(GraphicNode, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::GraphicNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleNode, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// floating frame
- TE(OleNode, Inside, NONE), // IE 4
- TE(OleNode, Inside, NONE), // SW
- TE(OleGraphic, Inside, NONE) // Netscape 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleNode, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // IE 4
- TE(OleGraphic, Inside, NONE), // SW
- TE(OleGraphic, Inside, NONE) // Netscape 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // IE 4
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
}, // SW
+ { HtmlOut::OleGraphic, HtmlPosition::Inside, HtmlContainerFlags::NONE
} // Netscape 4
},
{
// marquee (can always exported as marquee, because
// the content shows up at the right spot
- TE(Marquee, Inside, NONE), // IE 4
- TE(Marquee, Inside, NONE), // SW
- TE(Marquee, Inside, NONE) // Netscape 4
+ { HtmlOut::Marquee, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Marquee, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Marquee, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // IE 4
- TE(Control, Inside, NONE), // SW
- TE(Control, Inside, NONE) // Netscape 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// IE 4
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE },
// SW
+ { HtmlOut::Control, HtmlPosition::Inside, HtmlContainerFlags::NONE }
// Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // IE 4
- TE(GraphicFrame, Inside, NONE), // SW
- TE(GraphicFrame, Inside, NONE) // Netscape 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // IE 4
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE }, // SW
+ { HtmlOut::GraphicFrame, HtmlPosition::Inside,
HtmlContainerFlags::NONE } // Netscape 4
}
};
