Moved the table border model flag from style to DilloHtmlState (i.e. stack)

2 files changed, 0 insertions, 5 deletions

diff --git a/dw/style.cc b/dw/style.cc
index 319ad239..011f5225 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -51,7 +51,6 @@ void StyleAttrs::initValues ()
    borderWidth.setVal (0);
    padding.setVal (0);
    borderCollapse = BORDER_MODEL_SEPARATE;
-   collapseStyleSet = false;
    setBorderColor (NULL);
    setBorderStyle (BORDER_NONE);
    hBorderSpacing = 0;
@@ -127,7 +126,6 @@ bool StyleAttrs::equals (object::Object *other) {
        borderWidth.equals (&otherAttrs->borderWidth) &&
        padding.equals (&otherAttrs->padding) &&
        borderCollapse == otherAttrs->borderCollapse &&
-       collapseStyleSet == otherAttrs->collapseStyleSet &&
        borderColor.top == otherAttrs->borderColor.top &&
        borderColor.right == otherAttrs->borderColor.right &&
        borderColor.bottom == otherAttrs->borderColor.bottom &&
@@ -164,7 +162,6 @@ int StyleAttrs::hashValue () {
       borderWidth.hashValue () +
       padding.hashValue () +
       borderCollapse +
-      collapseStyleSet +
       (intptr_t) borderColor.top +
       (intptr_t) borderColor.right +
       (intptr_t) borderColor.bottom  +
@@ -254,7 +251,6 @@ void Style::copyAttrs (StyleAttrs *attrs)
    borderWidth = attrs->borderWidth;
    padding = attrs->padding;
    borderCollapse = attrs->borderCollapse;
-   collapseStyleSet = attrs->collapseStyleSet;
    borderColor = attrs->borderColor;
    borderStyle = attrs->borderStyle;
    display = attrs->display;
diff --git a/dw/style.hh b/dw/style.hh
index 2f6a98fc..36db0ab8 100644
--- a/dw/style.hh
+++ b/dw/style.hh
@@ -447,7 +447,6 @@ public:
 
    Box margin, borderWidth, padding;
    BorderCollapse borderCollapse;
-   bool collapseStyleSet;
    struct { Color *top, *right, *bottom, *left; } borderColor;
    struct { BorderStyle top, right, bottom, left; } borderStyle;