From 14d33feee045893d3e2be7c023db8d731dbb0099 Mon Sep 17 00:00:00 2001 From: "buster%netscape.com" Date: Wed, 16 Dec 1998 22:20:44 +0000 Subject: [PATCH] oops, there were duplicate entries for border collapse values. Now there's not. git-svn-id: svn://10.0.0.236/trunk@16537 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 2 +- mozilla/layout/base/nsStyleConsts.h | 4 ---- mozilla/layout/base/public/nsStyleConsts.h | 4 ---- mozilla/layout/base/src/nsStyleContext.cpp | 2 +- mozilla/layout/style/nsStyleContext.cpp | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index b1a63463040..2bb871cf95b 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre mCols = NS_STYLE_TABLE_COLS_NONE; mFrame = NS_STYLE_TABLE_FRAME_NONE; mRules = NS_STYLE_TABLE_RULES_NONE; - mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE; //XXX: should inherit + mBorderCollapse = NS_STYLE_BORDER_SEPARATE; //XXX: should inherit mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE; //XXX: should inherit mCaptionSide = NS_SIDE_TOP; //XXX: should inherit mCellPadding.Reset(); diff --git a/mozilla/layout/base/nsStyleConsts.h b/mozilla/layout/base/nsStyleConsts.h index b7c7b06c290..e58d03b9670 100644 --- a/mozilla/layout/base/nsStyleConsts.h +++ b/mozilla/layout/base/nsStyleConsts.h @@ -409,12 +409,8 @@ #define NS_STYLE_TABLE_EMPTY_CELLS_HIDE 0 #define NS_STYLE_TABLE_EMPTY_CELLS_SHOW 1 -#define NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE 0 -#define NS_STYLE_TABLE_BORDER_COLLAPSE_COLLAPSE 1 - // CAPTION_SIDE uses NS_SIDE_* - // constants for cell "scope" attribute #define NS_STYLE_CELL_SCOPE_ROW 0 #define NS_STYLE_CELL_SCOPE_COL 1 diff --git a/mozilla/layout/base/public/nsStyleConsts.h b/mozilla/layout/base/public/nsStyleConsts.h index b7c7b06c290..e58d03b9670 100644 --- a/mozilla/layout/base/public/nsStyleConsts.h +++ b/mozilla/layout/base/public/nsStyleConsts.h @@ -409,12 +409,8 @@ #define NS_STYLE_TABLE_EMPTY_CELLS_HIDE 0 #define NS_STYLE_TABLE_EMPTY_CELLS_SHOW 1 -#define NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE 0 -#define NS_STYLE_TABLE_BORDER_COLLAPSE_COLLAPSE 1 - // CAPTION_SIDE uses NS_SIDE_* - // constants for cell "scope" attribute #define NS_STYLE_CELL_SCOPE_ROW 0 #define NS_STYLE_CELL_SCOPE_COL 1 diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index b1a63463040..2bb871cf95b 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre mCols = NS_STYLE_TABLE_COLS_NONE; mFrame = NS_STYLE_TABLE_FRAME_NONE; mRules = NS_STYLE_TABLE_RULES_NONE; - mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE; //XXX: should inherit + mBorderCollapse = NS_STYLE_BORDER_SEPARATE; //XXX: should inherit mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE; //XXX: should inherit mCaptionSide = NS_SIDE_TOP; //XXX: should inherit mCellPadding.Reset(); diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index b1a63463040..2bb871cf95b 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -661,7 +661,7 @@ void StyleTableImpl::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPre mCols = NS_STYLE_TABLE_COLS_NONE; mFrame = NS_STYLE_TABLE_FRAME_NONE; mRules = NS_STYLE_TABLE_RULES_NONE; - mBorderCollapse = NS_STYLE_TABLE_BORDER_COLLAPSE_SEPARATE; //XXX: should inherit + mBorderCollapse = NS_STYLE_BORDER_SEPARATE; //XXX: should inherit mEmptyCells = NS_STYLE_TABLE_EMPTY_CELLS_HIDE; //XXX: should inherit mCaptionSide = NS_SIDE_TOP; //XXX: should inherit mCellPadding.Reset();