VC7.1/SunCC bustage fix for bug 475522 r=surkov.alexander,ginn.chen

This commit is contained in:
Neil Rashbrook 2009-02-16 11:24:22 +00:00
parent 5227553ab5
commit a727e0e60e

View File

@ -117,43 +117,43 @@ nsTextAttrsMgr::GetAttributes(nsIPersistentProperties *aAttributes,
// "language" text attribute
nsLangTextAttr langTextAttr(mHyperTextAcc, mHyperTextNode, mOffsetNode);
textAttrArray.AppendElement(&langTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&langTextAttr));
// "color" text attribute
nsCSSTextAttr colorTextAttr(0, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&colorTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&colorTextAttr));
// "font-family" text attribute
nsCSSTextAttr fontFamilyTextAttr(1, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&fontFamilyTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&fontFamilyTextAttr));
// "font-style" text attribute
nsCSSTextAttr fontStyleTextAttr(2, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&fontStyleTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&fontStyleTextAttr));
// "font-weight" text attribute
nsCSSTextAttr fontWeightTextAttr(3, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&fontWeightTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&fontWeightTextAttr));
// "text-line-through-style" text attribute
nsCSSTextAttr lineThroughTextAttr(4, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&lineThroughTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&lineThroughTextAttr));
// "text-underline-style" text attribute
nsCSSTextAttr underlineTextAttr(5, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&underlineTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&underlineTextAttr));
// "text-position" text attribute
nsCSSTextAttr posTextAttr(6, hyperTextElm, offsetElm);
textAttrArray.AppendElement(&posTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&posTextAttr));
// "background-color" text attribute
nsBGColorTextAttr bgColorTextAttr(rootFrame, frame);
textAttrArray.AppendElement(&bgColorTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&bgColorTextAttr));
// "font-size" text attribute
nsFontSizeTextAttr fontSizeTextAttr(rootFrame, frame);
textAttrArray.AppendElement(&fontSizeTextAttr);
textAttrArray.AppendElement(static_cast<nsITextAttr*>(&fontSizeTextAttr));
// Expose text attributes if applicable.
if (aAttributes) {
@ -400,7 +400,7 @@ nsTextAttrsMgr::FindStartOffsetInSubtree(const nsTPtrArray<nsITextAttr>& aTextAt
nsLangTextAttr::nsLangTextAttr(nsHyperTextAccessible *aRootAcc,
nsIDOMNode *aRootNode, nsIDOMNode *aNode) :
nsTextAttr<nsAutoString>::nsTextAttr(aNode == nsnull)
nsTextAttr<nsAutoString>(aNode == nsnull)
{
mRootContent = do_QueryInterface(aRootNode);
@ -438,7 +438,7 @@ nsLangTextAttr::GetLang(nsIContent *aContent, nsAString& aLang)
nsCSSTextAttr::nsCSSTextAttr(PRUint32 aIndex, nsIDOMElement *aRootElm,
nsIDOMElement *aElm) :
nsTextAttr<nsAutoString>::nsTextAttr(aElm == nsnull), mIndex(aIndex)
nsTextAttr<nsAutoString>(aElm == nsnull), mIndex(aIndex)
{
mIsRootDefined = GetValueFor(aRootElm, &mRootNativeValue);
@ -488,7 +488,7 @@ nsCSSTextAttr::Format(const nsAutoString& aValue, nsAString& aFormattedValue)
// nsBackgroundTextAttr
nsBGColorTextAttr::nsBGColorTextAttr(nsIFrame *aRootFrame, nsIFrame *aFrame) :
nsTextAttr<nscolor>::nsTextAttr(aFrame == nsnull), mRootFrame(aRootFrame)
nsTextAttr<nscolor>(aFrame == nsnull), mRootFrame(aRootFrame)
{
mIsRootDefined = GetColor(mRootFrame, &mRootNativeValue);
if (aFrame)
@ -550,7 +550,7 @@ nsBGColorTextAttr::GetColor(nsIFrame *aFrame, nscolor *aColor)
// nsFontSizeTextAttr
nsFontSizeTextAttr::nsFontSizeTextAttr(nsIFrame *aRootFrame, nsIFrame *aFrame) :
nsTextAttr<nscoord>::nsTextAttr(aFrame == nsnull)
nsTextAttr<nscoord>(aFrame == nsnull)
{
mDC = aRootFrame->PresContext()->DeviceContext();