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

Fix for build bustage.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@45623 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 1999-09-02 02:09:21 +00:00
parent a9583b0332
commit 4bdc62dd9f
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/content/xul/content/src/nsXULElement.cpp
View File

@ -3630,17 +3630,20 @@ RDFElementImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresCon
aContext->GetMutableStyleData(eStyleStruct_Position);
switch (unit) {
case eHTMLUnit_Percent:
position->mWidth.SetPercentValue(floatVal);
position->mWidth.mUnit = eStyleUnit_Percent;
position->mWidth.mValue.mFloat = floatVal;
break;
case eHTMLUnit_Pixel:
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
position->mWidth.SetCoordValue(NSIntPixelsToTwips(intVal, p2t));
position->mWidth.mUnit = eStyleUnit_Coord;
position->mWidth.mValue.mInt = NSIntPixelsToTwips(intVal, p2t);
break;
case eHTMLUnit_Proportional:
position->mWidth.SetIntValue(intVal, eStyleUnit_Proportional);
position->mWidth.mUnit = eStyleUnit_Proportional;
position->mWidth.mValue.mInt = intVal;
break;
default:
break;

9
mozilla/rdf/content/src/nsRDFElement.cpp
View File

@ -3630,17 +3630,20 @@ RDFElementImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresCon
aContext->GetMutableStyleData(eStyleStruct_Position);
switch (unit) {
case eHTMLUnit_Percent:
position->mWidth.SetPercentValue(floatVal);
position->mWidth.mUnit = eStyleUnit_Percent;
position->mWidth.mValue.mFloat = floatVal;
break;
case eHTMLUnit_Pixel:
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
position->mWidth.SetCoordValue(NSIntPixelsToTwips(intVal, p2t));
position->mWidth.mUnit = eStyleUnit_Coord;
position->mWidth.mValue.mInt = NSIntPixelsToTwips(intVal, p2t);
break;
case eHTMLUnit_Proportional:
position->mWidth.SetIntValue(intVal, eStyleUnit_Proportional);
position->mWidth.mUnit = eStyleUnit_Proportional;
position->mWidth.mValue.mInt = intVal;
break;
default:
break;

9
mozilla/rdf/content/src/nsXULElement.cpp
View File

@ -3630,17 +3630,20 @@ RDFElementImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresCon
aContext->GetMutableStyleData(eStyleStruct_Position);
switch (unit) {
case eHTMLUnit_Percent:
position->mWidth.SetPercentValue(floatVal);
position->mWidth.mUnit = eStyleUnit_Percent;
position->mWidth.mValue.mFloat = floatVal;
break;
case eHTMLUnit_Pixel:
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
position->mWidth.SetCoordValue(NSIntPixelsToTwips(intVal, p2t));
position->mWidth.mUnit = eStyleUnit_Coord;
position->mWidth.mValue.mInt = NSIntPixelsToTwips(intVal, p2t);
break;
case eHTMLUnit_Proportional:
position->mWidth.SetIntValue(intVal, eStyleUnit_Proportional);
position->mWidth.mUnit = eStyleUnit_Proportional;
position->mWidth.mValue.mInt = intVal;
break;
default:
break;