summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/source/filter/html/htmlatr.cxx14
-rw-r--r--sw/source/filter/html/htmlfly.cxx6
-rw-r--r--sw/source/filter/html/htmlfly.hxx105
-rw-r--r--sw/source/filter/html/htmlflyt.cxx538
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx65
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.hxx8
7 files changed, 373 insertions, 365 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index d2aad8c73bf3..6c40de25126b 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2024,7 +2024,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
rHTMLWrt.ChangeParaToken( 0 );
// Output all the nodes that are anchored to a frame
- rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY );
+ rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HtmlPosition::Any );
if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine(); // paragraph tag on a new line
@@ -2136,7 +2136,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken;
// Output all frames that are anchored to this node
- rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY );
+ rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HtmlPosition::Any );
rHTMLWrt.m_bLFPossible = false;
return rWrt;
@@ -2189,13 +2189,13 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
rHTMLWrt.OutForm();
// Output the page-anchored frames that are 'anchored' to this node
- bool bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_PREFIX );
+ bool bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HtmlPosition::Prefix );
// Output all frames that are anchored to this node that are supposed to
// be written before the paragraph tag.
if( bFlysLeft )
{
- bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_BEFORE );
+ bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HtmlPosition::Before );
}
if( rHTMLWrt.pCurPam->GetPoint()->nNode == rHTMLWrt.pCurPam->GetMark()->nNode )
@@ -2361,7 +2361,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
{
aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(),
- nStrPos, HTML_POS_INSIDE,
+ nStrPos, HtmlPosition::Inside,
&aContext );
}
@@ -2510,7 +2510,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
// Output the frames that are anchored to the last position
if( bFlysLeft )
bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(),
- nEnd, HTML_POS_INSIDE );
+ nEnd, HtmlPosition::Inside );
OSL_ENSURE( !bFlysLeft, "Not all frames were saved!" );
rHTMLWrt.m_bTextAttr = false;
@@ -2848,7 +2848,7 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
SwHTMLFrameType eType =
(SwHTMLFrameType)rHTMLWrt.GuessFrameType( rFormat, pSdrObj );
- sal_uInt8 nMode = aHTMLOutFrameAsCharTable[eType][rHTMLWrt.m_nExportMode];
+ AllHtmlFlags nMode = aHTMLOutFrameAsCharTable[eType][rHTMLWrt.m_nExportMode];
rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj );
return rWrt;
}
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index ddabe12afee2..14cd01e707a2 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -37,17 +37,17 @@ using namespace css;
SwHTMLPosFlyFrame::SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly,
const SdrObject *pSdrObj,
- sal_uInt8 nOutMode ) :
+ AllHtmlFlags nAllFlags ) :
pFrameFormat( &rPosFly.GetFormat() ),
pSdrObject( pSdrObj ),
pNdIdx( new SwNodeIndex( rPosFly.GetNdIndex() ) ),
nOrdNum( rPosFly.GetOrdNum() ),
nContentIdx( 0 ),
- nOutputMode( nOutMode )
+ nAllFlags( nAllFlags )
{
const SwFormatAnchor& rAnchor = rPosFly.GetFormat().GetAnchor();
if ((FLY_AT_CHAR == rAnchor.GetAnchorId()) &&
- HTML_POS_INSIDE == GetOutPos() )
+ HtmlPosition::Inside == GetOutPos() )
{
// Auto-gebundene Rahmen werden ein Zeichen weiter hinten
// ausgegeben, weil dann die Positionierung mit Netscape
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index bec4aa7bce4d..8fe110c90ed4 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -22,6 +22,7 @@
#include <tools/solar.h>
#include <o3tl/sorted_vector.hxx>
+#include <o3tl/typed_flags_set.hxx>
class SdrObject;
class SwFrameFormat;
@@ -48,48 +49,59 @@ enum SwHTMLFrameType
HTML_FRMTYPE_END
};
-#define HTML_OUT_TBLNODE 0x00
-#define HTML_OUT_GRFNODE 0x01
-#define HTML_OUT_OLENODE 0x02
-#define HTML_OUT_DIV 0x03
-#define HTML_OUT_MULTICOL 0x04
-#define HTML_OUT_SPACER 0x05
-#define HTML_OUT_CONTROL 0x06
-#define HTML_OUT_AMARQUEE 0x07
-#define HTML_OUT_MARQUEE 0x08
-#define HTML_OUT_GRFFRM 0x09
-#define HTML_OUT_OLEGRF 0x0a
-#define HTML_OUT_SPAN 0x0b
-#define HTML_OUT_MASK 0x0f
-
-#define HTML_POS_PREFIX 0x00
-#define HTML_POS_BEFORE 0x10
-#define HTML_POS_INSIDE 0x20
-#define HTML_POS_ANY 0x30
-#define HTML_POS_MASK 0x30
-
-#define HTML_CNTNR_NONE 0x00
-#define HTML_CNTNR_SPAN 0x40
-#define HTML_CNTNR_DIV 0x80
-#define HTML_CNTNR_MASK 0xc0
+enum class HtmlOut {
+ TableNode,
+ GraphicNode,
+ OleNode,
+ Div,
+ MultiCol,
+ Spacer,
+ Control,
+ AMarquee,
+ Marquee,
+ GraphicFrame,
+ OleGraphic,
+ Span
+};
+
+enum class HtmlPosition {
+ Prefix,
+ Before,
+ Inside,
+ Any
+};
+
+enum class HtmlContainerFlags {
+ NONE = 0x00,
+ Span = 0x01,
+ Div = 0x02,
+};
+namespace o3tl {
+ template<> struct typed_flags<HtmlContainerFlags> : is_typed_flags<HtmlContainerFlags, 0x03> {};
+}
const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END;
const sal_uInt16 MAX_BROWSERS = 4;
-extern sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
+struct AllHtmlFlags {
+ HtmlOut nOut;
+ HtmlPosition nPosition;
+ HtmlContainerFlags nContainer;
+};
+extern AllHtmlFlags aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern AllHtmlFlags aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern AllHtmlFlags aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern AllHtmlFlags aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern AllHtmlFlags aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
class SwHTMLPosFlyFrame
{
- const SwFrameFormat *pFrameFormat; // der Rahmen
- const SdrObject *pSdrObject; // ggf. Sdr-Objekt
- SwNodeIndex *pNdIdx; // Node-Index
- sal_uInt32 nOrdNum; // Aus SwPosFlyFrame
- sal_Int32 nContentIdx; // seine Position im Content
- sal_uInt8 nOutputMode; // Ausgabe-Infos
+ const SwFrameFormat *pFrameFormat; // der Rahmen
+ const SdrObject *pSdrObject; // ggf. Sdr-Objekt
+ SwNodeIndex *pNdIdx; // Node-Index
+ sal_uInt32 nOrdNum; // Aus SwPosFlyFrame
+ sal_Int32 nContentIdx; // seine Position im Content
+ AllHtmlFlags nAllFlags;
SwHTMLPosFlyFrame(const SwHTMLPosFlyFrame&) = delete;
SwHTMLPosFlyFrame& operator=(const SwHTMLPosFlyFrame&) = delete;
@@ -97,24 +109,17 @@ class SwHTMLPosFlyFrame
public:
SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly,
- const SdrObject *pSdrObj, sal_uInt8 nOutMode );
+ const SdrObject *pSdrObj, AllHtmlFlags nAllFlags );
bool operator<( const SwHTMLPosFlyFrame& ) const;
- const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
- const SdrObject *GetSdrObject() const { return pSdrObject; }
-
- const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
-
- sal_Int32 GetContentIndex() const { return nContentIdx; }
-
- sal_uInt8 GetOutMode() const { return nOutputMode; }
-
- static sal_uInt8 GetOutFn( sal_uInt8 nMode ) { return nMode & HTML_OUT_MASK; }
- static sal_uInt8 GetOutCntnr( sal_uInt8 nMode ) { return nMode & HTML_CNTNR_MASK; }
-
- sal_uInt8 GetOutFn() const { return nOutputMode & HTML_OUT_MASK; }
- sal_uInt8 GetOutPos() const { return nOutputMode & HTML_POS_MASK; }
+ const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
+ const SdrObject* GetSdrObject() const { return pSdrObject; }
+ const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
+ sal_Int32 GetContentIndex() const { return nContentIdx; }
+ AllHtmlFlags GetOutMode() const { return nAllFlags; }
+ HtmlOut GetOutFn() const { return nAllFlags.nOut; }
+ HtmlPosition GetOutPos() const { return nAllFlags.nPosition; }
};
class SwHTMLPosFlyFrames
diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx
index f8b61022b07f..a54492d3f3aa 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -19,486 +19,486 @@
#include "htmlfly.hxx"
-#define TE(t,p,c) (sal_uInt8)( HTML_OUT_##t | HTML_POS_##p | HTML_CNTNR_##c )
+#define TE(t,p,c) { HtmlOut::t, HtmlPosition::p, HtmlContainerFlags::c }
-sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
+AllHtmlFlags aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4!
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(Div, Prefix, NONE), // IE 4
+ TE(Div, Prefix, NONE), // SW
+ TE(Div, Prefix, NONE) // Netscape 4!
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(Div, Prefix, NONE), // IE 4
+ TE(Div, Prefix, NONE), // SW
+ TE(Div, Prefix, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, PREFIX, NONE), // IE 4
- TE(MULTICOL,PREFIX, NONE), // SW
- TE(MULTICOL,PREFIX, DIV) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Prefix, NONE), // IE 4
+ TE(MultiCol, Prefix, NONE), // SW
+ TE(MultiCol, Prefix, Div) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Div, Prefix, NONE), // IE 4
+ TE(Div, Prefix, NONE), // SW
+ TE(Div, Prefix, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Div, Prefix, NONE), // IE 4
+ TE(Div, Prefix, NONE), // SW
+ TE(Div, Prefix, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, PREFIX, NONE), // IE 4
- TE(GRFNODE, PREFIX, NONE), // SW
- TE(GRFNODE, PREFIX, SPAN) // Netscape 4
+ TE(GraphicNode, Inside, NONE), // HTML 3.2
+ TE(GraphicNode, Prefix, NONE), // IE 4
+ TE(GraphicNode, Prefix, NONE), // SW
+ TE(GraphicNode, Prefix, Span) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLENODE, PREFIX, SPAN) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Prefix, NONE), // IE 4
+ TE(OleNode, Prefix, NONE), // SW
+ TE(OleNode, Prefix, Span) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLENODE, PREFIX, SPAN) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Prefix, NONE), // IE 4
+ TE(OleNode, Prefix, NONE), // SW
+ TE(OleNode, Prefix, Span) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLEGRF, PREFIX, SPAN) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleNode, Prefix, NONE), // IE 4
+ TE(OleNode, Prefix, NONE), // SW
+ TE(OleGraphic, Prefix, Span) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, PREFIX, NONE), // IE 4
- TE(OLEGRF, PREFIX, NONE), // SW
- TE(OLEGRF, PREFIX, SPAN) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleGraphic, Prefix, NONE), // IE 4
+ TE(OleGraphic, Prefix, NONE), // SW
+ TE(OleGraphic, Prefix, Span) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,PREFIX, NONE), // IE 4
- TE(AMARQUEE,PREFIX, NONE), // SW
- TE(GRFFRM, PREFIX, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(AMarquee, Prefix, NONE), // IE 4
+ TE(AMarquee, Prefix, NONE), // SW
+ TE(GraphicFrame, Prefix, Span) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, PREFIX, NONE), // IE 4
- TE(CONTROL, PREFIX, NONE), // SW
- // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus.
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(Control, Inside, NONE), // HTML 3.2
+ TE(Control, Prefix, NONE), // IE 4
+ TE(Control, Prefix, NONE), // SW
+ // Netscape schaltet FORM bei Controls in abs.-pos. Span aus.
+ TE(Control, Inside, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, PREFIX, NONE), // IE 4
- TE(GRFFRM, PREFIX, NONE), // SW
- TE(GRFFRM, PREFIX, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Prefix, NONE), // IE 4
+ TE(GraphicFrame, Prefix, NONE), // SW
+ TE(GraphicFrame, Prefix, Span) // Netscape 4
}
};
-sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
+AllHtmlFlags aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(TBLNODE, BEFORE, NONE), // IE 4
- TE(TBLNODE, BEFORE, NONE), // SW
- TE(TBLNODE, BEFORE, NONE) // Netscape 4
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(TableNode, Before, NONE), // IE 4
+ TE(TableNode, Before, NONE), // SW
+ TE(TableNode, Before, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(DIV, BEFORE, NONE), // SW
- TE(TBLNODE, BEFORE, NONE) // Netscape 4
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(Div, Before, NONE), // IE 4
+ TE(Div, Before, NONE), // SW
+ TE(TableNode, Before, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(GRFFRM, BEFORE, NONE), // IE 4
- TE(MULTICOL,BEFORE, NONE), // SW
- TE(MULTICOL,BEFORE, DIV) // Netscape 4
+ TE(GraphicFrame, Before, NONE), // HTML 3.2
+ TE(GraphicFrame, Before, NONE), // IE 4
+ TE(MultiCol, Before, NONE), // SW
+ TE(MultiCol, Before, Div) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(SPACER, BEFORE, NONE), // SW
- TE(SPACER, BEFORE, NONE) // Netscape 4
+ TE(GraphicFrame, Before, NONE), // HTML 3.2
+ TE(Div, Before, NONE), // IE 4
+ TE(Spacer, Before, NONE), // SW
+ TE(Spacer, Before, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(DIV, BEFORE, NONE), // SW
- TE(DIV, BEFORE, NONE) // Netscape 4
+ TE(GraphicFrame, Before, NONE), // HTML 3.2
+ TE(Div, Before, NONE), // IE 4
+ TE(Div, Before, NONE), // SW
+ TE(Div, Before, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, BEFORE, NONE), // HTML 3.2
- TE(GRFNODE, BEFORE, NONE), // IE 4
- TE(GRFNODE, BEFORE, NONE), // SW
- TE(GRFNODE, BEFORE, NONE) // Netscape 4
+ TE(GraphicNode, Before, NONE), // HTML 3.2
+ TE(GraphicNode, Before, NONE), // IE 4
+ TE(GraphicNode, Before, NONE), // SW
+ TE(GraphicNode, Before, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLENODE, BEFORE, NONE) // Netscape 4
+ TE(OleNode, Before, NONE), // HTML 3.2
+ TE(OleNode, Before, NONE), // IE 4
+ TE(OleNode, Before, NONE), // SW
+ TE(OleNode, Before, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLENODE, BEFORE, NONE) // Netscape 4
+ TE(OleNode, Before, NONE), // HTML 3.2
+ TE(OleNode, Before, NONE), // IE 4
+ TE(OleNode, Before, NONE), // SW
+ TE(OleNode, Before, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLEGRF, BEFORE, NONE) // Netscape 4
+ TE(OleGraphic, Before, NONE), // HTML 3.2
+ TE(OleNode, Before, NONE), // IE 4
+ TE(OleNode, Before, NONE), // SW
+ TE(OleGraphic, Before, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, BEFORE, NONE), // HTML 3.2
- TE(OLEGRF, BEFORE, NONE), // IE 4
- TE(OLEGRF, BEFORE, NONE), // SW
- TE(OLEGRF, BEFORE, NONE) // Netscape 4
+ TE(OleGraphic, Before, NONE), // HTML 3.2
+ TE(OleGraphic, Before, NONE), // IE 4
+ TE(OleGraphic, Before, NONE), // SW
+ TE(OleGraphic, Before, NONE) // Netscape 4
},
{
// Laufschrift (fuer Netscape 4 im Container, damit
// die LAufschrift an der richtigen Stelle erscheint
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(AMARQUEE,BEFORE, NONE), // IE 4
- TE(AMARQUEE,BEFORE, NONE), // SW
- TE(GRFFRM, BEFORE, NONE) // Netscape 4
+ TE(GraphicFrame, Before, NONE), // HTML 3.2
+ TE(AMarquee, Before, NONE), // IE 4
+ TE(AMarquee, Before, NONE), // SW
+ TE(GraphicFrame, Before, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, BEFORE, NONE), // IE 4
- TE(CONTROL, BEFORE, NONE), // SW
+ TE(Control, Inside, NONE), // HTML 3.2
+ TE(Control, Before, NONE), // IE 4
+ TE(Control, Before, NONE), // SW
// hier koennte man einen Container draus machen (Import fehlt)
- TE(CONTROL, BEFORE, NONE) // Netscape 4
+ TE(Control, Before, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(GRFFRM, BEFORE, NONE), // IE 4
- TE(GRFFRM, BEFORE, NONE), // SW
- TE(GRFFRM, BEFORE, NONE) // Netscape 4
+ TE(GraphicFrame, Before, NONE), // HTML 3.2
+ TE(GraphicFrame, Before, NONE), // IE 4
+ TE(GraphicFrame, Before, NONE), // SW
+ TE(GraphicFrame, Before, NONE) // Netscape 4
}
};
-sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
+AllHtmlFlags aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, INSIDE, NONE), // HTML 3.2
- TE(TBLNODE, INSIDE, NONE), // IE 4
- TE(TBLNODE, INSIDE, NONE), // SW
- TE(TBLNODE, INSIDE, NONE) // Netscape 4
+ TE(TableNode, Inside, NONE), // HTML 3.2
+ TE(TableNode, Inside, NONE), // IE 4
+ TE(TableNode, Inside, NONE), // SW
+ TE(TableNode, Inside, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TableNode, Inside, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(MultiCol, Inside, NONE), // SW
+ TE(MultiCol, Inside, Span) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPACER, INSIDE, NONE), // SW
- TE(SPACER, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Spacer, Inside, NONE), // SW
+ TE(Spacer, Inside, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, NONE) // Netscape 4
+ TE(GraphicNode, Inside, NONE), // HTML 3.2
+ TE(GraphicNode, Inside, NONE), // IE 4
+ TE(GraphicNode, Inside, NONE), // SW
+ TE(GraphicNode, Inside, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleGraphic, Inside, NONE), // IE 4
+ TE(OleGraphic, Inside, NONE), // SW
+ TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,INSIDE, NONE), // IE 4
- TE(AMARQUEE,INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(AMarquee, Inside, NONE), // IE 4
+ TE(AMarquee, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
+ TE(Control, Inside, NONE), // HTML 3.2
+ TE(Control, Inside, NONE), // IE 4
+ TE(Control, Inside, NONE), // SW
// hier koennte man einen Container draus machen (Import fehlt)
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(Control, Inside, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
}
};
-sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
+AllHtmlFlags aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TableNode, Before, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(MultiCol, Inside, NONE), // SW
+ TE(MultiCol, Inside, Span) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(Span, Inside, NONE), // IE 4
+ TE(Span, Inside, NONE), // SW
+ TE(Span, Inside, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, SPAN) // Netscape 4
+ TE(GraphicNode, Inside, NONE), // HTML 3.2
+ TE(GraphicNode, Inside, NONE), // IE 4
+ TE(GraphicNode, Inside, NONE), // SW
+ TE(GraphicNode, Inside, Span) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, SPAN) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, Span) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, SPAN) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, Span) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, SPAN) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleGraphic, Inside, Span) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, SPAN) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleGraphic, Inside, NONE), // IE 4
+ TE(OleGraphic, Inside, NONE), // SW
+ TE(OleGraphic, Inside, Span) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,INSIDE, NONE), // IE 4
- TE(AMARQUEE,INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(AMarquee, Inside, NONE), // IE 4
+ TE(AMarquee, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, Span) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
- // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus.
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(Control, Inside, NONE), // HTML 3.2
+ TE(Control, Inside, NONE), // IE 4
+ TE(Control, Inside, NONE), // SW
+ // Netscape schaltet FORM bei Controls in abs.-pos. Span aus.
+ TE(Control, Inside, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, SPAN) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, Span) // Netscape 4
}
};
-sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
+AllHtmlFlags aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(MultiCol, Inside, NONE), // SW
+ TE(MultiCol, Inside, NONE) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(SPACER, INSIDE, NONE), // SW
- TE(SPACER, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(Spacer, Inside, NONE), // SW
+ TE(Spacer, Inside, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, NONE) // Netscape 4
+ TE(GraphicNode, Inside, NONE), // HTML 3.2
+ TE(GraphicNode, Inside, NONE), // IE 4
+ TE(GraphicNode, Inside, NONE), // SW
+ TE(GraphicNode, Inside, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OleNode, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleNode, Inside, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleNode, Inside, NONE), // IE 4
+ TE(OleNode, Inside, NONE), // SW
+ TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OleGraphic, Inside, NONE), // HTML 3.2
+ TE(OleGraphic, Inside, NONE), // IE 4
+ TE(OleGraphic, Inside, NONE), // SW
+ TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
- // Laufschrift (kann immer als MARQUEE exportiert werden, weil
+ // Laufschrift (kann immer als Marquee exportiert werden, weil
// der Inhalt an der richtigen Stelle erscheint
- TE(MARQUEE, INSIDE, NONE), // HTML 3.2
- TE(MARQUEE, INSIDE, NONE), // IE 4
- TE(MARQUEE, INSIDE, NONE), // SW
- TE(MARQUEE, INSIDE, NONE) // Netscape 4
+ TE(Marquee, Inside, NONE), // HTML 3.2
+ TE(Marquee, Inside, NONE), // IE 4
+ TE(Marquee, Inside, NONE), // SW
+ TE(Marquee, Inside, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(Control, Inside, NONE), // HTML 3.2
+ TE(Control, Inside, NONE), // IE 4
+ TE(Control, Inside, NONE), // SW
+ TE(Control, Inside, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GraphicFrame, Inside, NONE), // HTML 3.2
+ TE(GraphicFrame, Inside, NONE), // IE 4
+ TE(GraphicFrame, Inside, NONE), // SW
+ TE(GraphicFrame, Inside, NONE) // Netscape 4
}
};
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index ebfcadbad895..22b900c3ee18 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -303,7 +303,7 @@ void SwHTMLWriter::CollectFlyFrames()
const SwContentNode *pACNd;
SwHTMLFrameType eType = (SwHTMLFrameType)GuessFrameType( rFrameFormat, pSdrObj );
- sal_uInt8 nMode;
+ AllHtmlFlags nMode;
const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
sal_Int16 eHoriRel = rFrameFormat.GetHoriOrient().GetRelationOrient();
switch( rAnchor.GetAnchorId() )
@@ -352,7 +352,7 @@ void SwHTMLWriter::CollectFlyFrames()
}
}
-bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos,
+bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, HtmlPosition nPos,
HTMLOutContext *pContext )
{
bool bFlysLeft = false; // Are there still Flys left at the current node position?
@@ -374,7 +374,7 @@ bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uIn
(*m_pHTMLPosFlyFrames)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ )
{
SwHTMLPosFlyFrame *pPosFly = (*m_pHTMLPosFlyFrames)[i];
- if( ( HTML_POS_ANY == nPos ||
+ if( ( HtmlPosition::Any == nPos ||
pPosFly->GetOutPos() == nPos ) &&
pPosFly->GetContentIndex() == nContentIdx )
{
@@ -398,15 +398,16 @@ bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uIn
}
OutFrameFormat( pPosFly->GetOutMode(), pPosFly->GetFormat(),
- pPosFly->GetSdrObject() );
+ pPosFly->GetSdrObject() );
switch( pPosFly->GetOutFn() )
{
- case HTML_OUT_DIV:
- case HTML_OUT_SPAN:
- case HTML_OUT_MULTICOL:
- case HTML_OUT_TBLNODE:
+ case HtmlOut::Div:
+ case HtmlOut::Span:
+ case HtmlOut::MultiCol:
+ case HtmlOut::TableNode:
bRestart = true; // It could become recursive here
break;
+ default: break;
}
delete pPosFly;
}
@@ -420,20 +421,20 @@ bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uIn
return bFlysLeft;
}
-void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameFormat,
+void SwHTMLWriter::OutFrameFormat( AllHtmlFlags nMode, const SwFrameFormat& rFrameFormat,
const SdrObject *pSdrObject )
{
- sal_uInt8 nCntnrMode = SwHTMLPosFlyFrame::GetOutCntnr( nMode );
- sal_uInt8 nOutMode = SwHTMLPosFlyFrame::GetOutFn(nMode);
+ HtmlContainerFlags nCntnrMode = nMode.nContainer;
+ HtmlOut nOutMode = nMode.nOut;
const sal_Char *pCntnrStr = nullptr;
- if( HTML_CNTNR_NONE != nCntnrMode )
+ if( HtmlContainerFlags::NONE != nCntnrMode )
{
- if( m_bLFPossible && HTML_CNTNR_DIV == nCntnrMode )
+ if( m_bLFPossible && HtmlContainerFlags::Div == nCntnrMode )
OutNewLine();
OStringBuffer sOut;
- pCntnrStr = (HTML_CNTNR_DIV == nCntnrMode)
+ pCntnrStr = (HtmlContainerFlags::Div == nCntnrMode)
? OOO_STRING_SVTOOLS_HTML_division
: OOO_STRING_SVTOOLS_HTML_span;
sOut.append('<').append(pCntnrStr).append(' ')
@@ -445,7 +446,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
sal_uLong nFrameFlags = HTML_FRMOPTS_CNTNR;
// For frames with columns we can also output the background
- if( HTML_OUT_MULTICOL == nOutMode )
+ if( HtmlOut::MultiCol == nOutMode )
nFrameFlags |= HTML_FRMOPT_S_BACKGROUND|HTML_FRMOPT_S_BORDER;
if( IsHTMLMode( HTMLMODE_BORDER_NONE ) )
@@ -453,7 +454,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags, pSdrObject );
Strm().WriteChar( '>' );
- if( HTML_CNTNR_DIV == nCntnrMode )
+ if( HtmlContainerFlags::Div == nCntnrMode )
{
IncIndentLevel();
m_bLFPossible = true;
@@ -462,50 +463,50 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
switch( nOutMode )
{
- case HTML_OUT_TBLNODE: // OK
+ case HtmlOut::TableNode: // OK
OSL_ENSURE( !pCntnrStr, "Table: Container is not supposed to be here" );
OutHTML_FrameFormatTableNode( *this, rFrameFormat );
break;
- case HTML_OUT_GRFNODE: // OK
+ case HtmlOut::GraphicNode: // OK
OutHTML_FrameFormatGrfNode( *this, rFrameFormat, pCntnrStr != nullptr );
break;
- case HTML_OUT_OLENODE: // OK
+ case HtmlOut::OleNode: // OK
OutHTML_FrameFormatOLENode( *this, rFrameFormat, pCntnrStr != nullptr );
break;
- case HTML_OUT_OLEGRF: // OK
+ case HtmlOut::OleGraphic: // OK
OutHTML_FrameFormatOLENodeGrf( *this, rFrameFormat, pCntnrStr != nullptr );
break;
- case HTML_OUT_DIV:
- case HTML_OUT_SPAN:
+ case HtmlOut::Div:
+ case HtmlOut::Span:
OSL_ENSURE( !pCntnrStr, "Div: Container is not supposed to be here" );
- OutHTML_FrameFormatAsDivOrSpan( *this, rFrameFormat, HTML_OUT_SPAN==nOutMode );
+ OutHTML_FrameFormatAsDivOrSpan( *this, rFrameFormat, HtmlOut::Span==nOutMode );
break;
- case HTML_OUT_MULTICOL: // OK
+ case HtmlOut::MultiCol: // OK
OutHTML_FrameFormatAsMulticol( *this, rFrameFormat, pCntnrStr != nullptr );
break;
- case HTML_OUT_SPACER: // OK
+ case HtmlOut::Spacer: // OK
OSL_ENSURE( !pCntnrStr, "Spacer: Container is not supposed to be here" );
OutHTML_FrameFormatAsSpacer( *this, rFrameFormat );
break;
- case HTML_OUT_CONTROL: // OK
+ case HtmlOut::Control: // OK
OutHTML_DrawFrameFormatAsControl( *this,
static_cast<const SwDrawFrameFormat &>(rFrameFormat), dynamic_cast<const SdrUnoObj&>(*pSdrObject),
pCntnrStr != nullptr );
break;
- case HTML_OUT_AMARQUEE:
+ case HtmlOut::AMarquee:
OutHTML_FrameFormatAsMarquee( *this, rFrameFormat, *pSdrObject );
break;
- case HTML_OUT_MARQUEE:
+ case HtmlOut::Marquee:
OSL_ENSURE( !pCntnrStr, "Marquee: Container is not supposed to be here" );
OutHTML_DrawFrameFormatAsMarquee( *this,
static_cast<const SwDrawFrameFormat &>(rFrameFormat), *pSdrObject );
break;
- case HTML_OUT_GRFFRM:
+ case HtmlOut::GraphicFrame:
OutHTML_FrameFormatAsImage( *this, rFrameFormat, pCntnrStr != nullptr );
break;
}
- if( HTML_CNTNR_DIV == nCntnrMode )
+ if( HtmlContainerFlags::Div == nCntnrMode )
{
DecIndentLevel();
if( m_bLFPossible )
@@ -513,7 +514,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
m_bLFPossible = true;
}
- else if( HTML_CNTNR_SPAN == nCntnrMode )
+ else if( HtmlContainerFlags::Span == nCntnrMode )
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
}
@@ -1684,7 +1685,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
// Output frame-anchored frames that are anchored to the start node
- rHTMLWrt.OutFlyFrame( nStt, 0, HTML_POS_ANY );
+ rHTMLWrt.OutFlyFrame( nStt, 0, HtmlPosition::Any );
const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
OSL_ENSURE( pSttNd, "Where is the start node" );
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f0de3f6e2dcc..eab6e05d87e4 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1329,7 +1329,7 @@ void SwHTMLWriter::GetControls()
for( size_t i=0; i<m_pHTMLPosFlyFrames->size(); i++ )
{
const SwHTMLPosFlyFrame* pPosFlyFrame = (*m_pHTMLPosFlyFrames)[ i ];
- if( HTML_OUT_CONTROL != pPosFlyFrame->GetOutFn() )
+ if( HtmlOut::Control != pPosFlyFrame->GetOutFn() )
continue;
const SdrObject *pSdrObj = pPosFlyFrame->GetSdrObject();
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 4e9e73095b91..b637a611844c 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -32,6 +32,7 @@
#include "shellio.hxx"
#include "wrt_fn.hxx"
+#include "htmlfly.hxx"
// einige Forward Deklarationen
class Color;
@@ -54,6 +55,7 @@ class SvxFontItem;
class SwHTMLNumRuleInfo;
class SwHTMLPosFlyFrames;
class SwTextFootnote;
+enum class HtmlPosition;
typedef std::vector<SwTextFootnote*> SwHTMLTextFootnotes;
@@ -411,9 +413,9 @@ public:
// gebe die evt. an der akt. Position stehenden FlyFrame aus.
bool OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx,
- sal_uInt8 nPos, HTMLOutContext *pContext = nullptr );
- void OutFrameFormat( sal_uInt8 nType, const SwFrameFormat& rFormat,
- const SdrObject *pSdrObj );
+ HtmlPosition nPos, HTMLOutContext *pContext = nullptr );
+ void OutFrameFormat( AllHtmlFlags nType, const SwFrameFormat& rFormat,
+ const SdrObject *pSdrObj );
void OutForm( bool bTagOn=true, const SwStartNode *pStNd=nullptr );
void OutHiddenForms();
generated by cgit (git 2.34.1) at 2024-07-19 22:53:52 +0000