From 71ca7a033239963e9a568413b533ee2a38c2de96 Mon Sep 17 00:00:00 2001 From: "jfrancis%netscape.com" Date: Wed, 20 Sep 2000 06:06:39 +0000 Subject: [PATCH] fixing prob with getting branch in sync with tip git-svn-id: svn://10.0.0.236/branches/NOXIF_20000911_BRANCH@79604 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp | 2 +- mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp index ae69759a2ba..781f995673f 100644 --- a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp +++ b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp @@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText) NS_IMETHODIMP -nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType) +nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType) { NS_ENSURE_ARG_POINTER(aValueType); *aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE; diff --git a/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp b/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp index ae69759a2ba..781f995673f 100644 --- a/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp +++ b/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp @@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText) NS_IMETHODIMP -nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType) +nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType) { NS_ENSURE_ARG_POINTER(aValueType); *aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;