diff --git a/mozilla/layout/html/table/src/Makefile b/mozilla/layout/html/table/src/Makefile
index 61456d1bcef..fa0b0920f9f 100644
--- a/mozilla/layout/html/table/src/Makefile
+++ b/mozilla/layout/html/table/src/Makefile
@@ -24,7 +24,6 @@ LIBRARY_NAME = raptorhtmltable_s
# Note the sophisticated alphabetical ordering :-|
CPPSRCS = \
BasicTableLayoutStrategy.cpp \
- FixedTableLayoutStrategy.cpp \
nsCellMap.cpp \
nsTableCellFrame.cpp \
nsTableColFrame.cpp \
diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win
index 25793d9785c..2075701a29a 100644
--- a/mozilla/layout/html/table/src/makefile.win
+++ b/mozilla/layout/html/table/src/makefile.win
@@ -31,8 +31,7 @@ CPPSRCS= nsCellMap.cpp \
nsTableOuterFrame.cpp \
nsTableRowFrame.cpp \
nsTableRowGroupFrame.cpp \
- BasicTableLayoutStrategy.cpp \
- FixedTableLayoutStrategy.cpp
+ BasicTableLayoutStrategy.cpp
CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
.\$(OBJDIR)\nsTableCellFrame.obj .\$(OBJDIR)\nsTableColFrame.obj \
@@ -41,8 +40,7 @@ CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
.\$(OBJDIR)\nsTableOuterFrame.obj \
.\$(OBJDIR)\nsTableRowFrame.obj \
.\$(OBJDIR)\nsTableRowGroupFrame.obj \
- .\$(OBJDIR)\BasicTableLayoutStrategy.obj \
- .\$(OBJDIR)\FixedTableLayoutStrategy.obj
+ .\$(OBJDIR)\BasicTableLayoutStrategy.obj
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
-I..\..\base\src -I..\..\style\src -I..\..\content\src \
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index a9aceb647ea..8f136cb0547 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -29,7 +29,7 @@
#include "nsIHTMLContent.h"
#include "BasicTableLayoutStrategy.h"
-#include "FixedTableLayoutStrategy.h"
+// #include "FixedTableLayoutStrategy.h"
#include "nsIPresContext.h"
#include "nsCSSRendering.h"
@@ -2298,9 +2298,11 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
{
nsStyleTable* tableStyle;
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
+#if XXX
if (NS_STYLE_TABLE_LAYOUT_FIXED==tableStyle->mLayoutStrategy)
mTableLayoutStrategy = new FixedTableLayoutStrategy(this, numCols);
else
+#endif
mTableLayoutStrategy = new BasicTableLayoutStrategy(this, numCols);
mTableLayoutStrategy->Initialize(aMaxElementSize);
}
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index a9aceb647ea..8f136cb0547 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -29,7 +29,7 @@
#include "nsIHTMLContent.h"
#include "BasicTableLayoutStrategy.h"
-#include "FixedTableLayoutStrategy.h"
+// #include "FixedTableLayoutStrategy.h"
#include "nsIPresContext.h"
#include "nsCSSRendering.h"
@@ -2298,9 +2298,11 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
{
nsStyleTable* tableStyle;
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
+#if XXX
if (NS_STYLE_TABLE_LAYOUT_FIXED==tableStyle->mLayoutStrategy)
mTableLayoutStrategy = new FixedTableLayoutStrategy(this, numCols);
else
+#endif
mTableLayoutStrategy = new BasicTableLayoutStrategy(this, numCols);
mTableLayoutStrategy->Initialize(aMaxElementSize);
}