Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed unit assumptions in map attributes into

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9096 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com
1998-09-02 02:12:41 +00:00
parent 9b0743f19a
commit 4ed0ab4604
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/html/table/src/nsTablePart.cpp
View File

@@ -748,9 +748,7 @@ nsTablePart::MapAttributesInto(nsIStyleContext* aContext,
// align
GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() != eHTMLUnit_Null) {
NS_ASSERTION(value.GetUnit() == eHTMLUnit_Enumerated, "unexpected unit");
if (value.GetUnit() == eHTMLUnit_Enumerated) { // it may be another type if illegal
nsStyleDisplay* display = (nsStyleDisplay*)aContext->GetMutableStyleData(eStyleStruct_Display);
switch (value.GetIntValue()) {
case NS_STYLE_TEXT_ALIGN_LEFT:
@@ -766,14 +764,14 @@ nsTablePart::MapAttributesInto(nsIStyleContext* aContext,
// cellpadding
nsStyleTable* tableStyle=nsnull;
GetAttribute(nsHTMLAtoms::cellpadding, value);
if (value.GetUnit() != eHTMLUnit_Null) {
if (value.GetUnit() == eHTMLUnit_Pixel) {
tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mCellPadding.SetCoordValue(NSIntPixelsToTwips(value.GetPixelValue(), p2t));
}
// cellspacing (reuses tableStyle if already resolved)
GetAttribute(nsHTMLAtoms::cellspacing, value);
if (value.GetUnit() != eHTMLUnit_Null) {
if (value.GetUnit() == eHTMLUnit_Pixel) {
if (nsnull==tableStyle)
tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mCellSpacing.SetCoordValue(NSIntPixelsToTwips(value.GetPixelValue(), p2t));