From f185064ad519f8661236cd09833a60b44f5c7a85 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Tue, 28 Mar 2000 01:01:49 +0000 Subject: [PATCH] Fix for 33447, r=serge git-svn-id: svn://10.0.0.236/trunk@64290 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 8 ++++---- mozilla/layout/html/base/src/nsObjectFrame.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 1db96d9bcb0..9e2cb51c412 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -2071,10 +2071,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetWidth(PRUint32 *result) { *result = 0; - PRUint32 attr = (PRUint32)atol(width); + PRInt32 attr = atol(width); if(nsnull == strchr(width, '%')) - *result = attr; + *result = (PRUint32)attr; else { if(mContext == nsnull) @@ -2130,10 +2130,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetHeight(PRUint32 *result) { *result = 0; - PRUint32 attr = (PRUint32)atol(height); + PRInt32 attr = atol(height); if(nsnull == strchr(height, '%')) - *result = attr; + *result = (PRUint32)attr; else { if(mContext == nsnull) diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 1db96d9bcb0..9e2cb51c412 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -2071,10 +2071,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetWidth(PRUint32 *result) { *result = 0; - PRUint32 attr = (PRUint32)atol(width); + PRInt32 attr = atol(width); if(nsnull == strchr(width, '%')) - *result = attr; + *result = (PRUint32)attr; else { if(mContext == nsnull) @@ -2130,10 +2130,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetHeight(PRUint32 *result) { *result = 0; - PRUint32 attr = (PRUint32)atol(height); + PRInt32 attr = atol(height); if(nsnull == strchr(height, '%')) - *result = attr; + *result = (PRUint32)attr; else { if(mContext == nsnull)