From b76f16233cc1839ec2e9e3d6ce72d62f5536f3ca Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com" <peterl%netscape.com>
Date: Sun, 18 Jul 1999 00:10:59 +0000
Subject: [PATCH] change color name lookup api to use nsString

---
 gfx/src/os2/nsRenderingContextOS2.cpp     | 7 ++-----
 gfx/src/ps/nsRenderingContextPS.cpp       | 6 ++----
 gfx/src/windows/nsRenderingContextWin.cpp | 6 ++----
 gfx/src/xlib/nsRenderingContextXlib.cpp   | 6 ++----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/gfx/src/os2/nsRenderingContextOS2.cpp b/gfx/src/os2/nsRenderingContextOS2.cpp
index d34bce6fddfb..5065c695e640 100644
--- a/gfx/src/os2/nsRenderingContextOS2.cpp
+++ b/gfx/src/os2/nsRenderingContextOS2.cpp
@@ -828,12 +828,9 @@ NS_IMETHODIMP nsRenderingContextOS2::GetColor( nsString &aColor)
 NS_IMETHODIMP nsRenderingContextOS2::SetColor(const nsString& aColor)
 {
    nscolor rgb;
-   char    cbuf[40];
-
-   aColor.ToCString( cbuf, sizeof(cbuf));
-   if( NS_ColorNameToRGB( cbuf, &rgb))
+   if( NS_ColorNameToRGB(aColor, &rgb))
       SetColor(rgb);
-   else if( NS_HexToRGB( cbuf, &rgb))
+   else if( NS_HexToRGB(aColor, &rgb))
       SetColor(rgb);
 
    return NS_OK;
diff --git a/gfx/src/ps/nsRenderingContextPS.cpp b/gfx/src/ps/nsRenderingContextPS.cpp
index cb40e7b66278..41e012f6a044 100644
--- a/gfx/src/ps/nsRenderingContextPS.cpp
+++ b/gfx/src/ps/nsRenderingContextPS.cpp
@@ -1328,12 +1328,10 @@ NS_IMETHODIMP
 nsRenderingContextPS::SetColor(const nsString& aColor)
 {
   nscolor rgb;
-  char cbuf[40];
-  aColor.ToCString(cbuf, sizeof(cbuf));
-  if (NS_ColorNameToRGB(cbuf, &rgb)) {
+  if (NS_ColorNameToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
-  else if (NS_HexToRGB(cbuf, &rgb)) {
+  else if (NS_HexToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
   return NS_OK;
diff --git a/gfx/src/windows/nsRenderingContextWin.cpp b/gfx/src/windows/nsRenderingContextWin.cpp
index 5bfb21221a41..4240ff945d37 100644
--- a/gfx/src/windows/nsRenderingContextWin.cpp
+++ b/gfx/src/windows/nsRenderingContextWin.cpp
@@ -1990,12 +1990,10 @@ NS_IMETHODIMP
 nsRenderingContextWin::SetColor(const nsString& aColor)
 {
   nscolor rgb;
-  char cbuf[40];
-  aColor.ToCString(cbuf, sizeof(cbuf));
-  if (NS_ColorNameToRGB(cbuf, &rgb)) {
+  if (NS_ColorNameToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
-  else if (NS_HexToRGB(cbuf, &rgb)) {
+  else if (NS_HexToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
   return NS_OK;
diff --git a/gfx/src/xlib/nsRenderingContextXlib.cpp b/gfx/src/xlib/nsRenderingContextXlib.cpp
index aea71bfa8754..f2c8c3e428a9 100644
--- a/gfx/src/xlib/nsRenderingContextXlib.cpp
+++ b/gfx/src/xlib/nsRenderingContextXlib.cpp
@@ -570,12 +570,10 @@ NS_IMETHODIMP
 nsRenderingContextXlib::SetColor(const nsString &aColor)
 {
   nscolor rgb;
-  char cbuf[40];
-  aColor.ToCString(cbuf, sizeof(cbuf));
-  if (NS_ColorNameToRGB(cbuf, &rgb)) {
+  if (NS_ColorNameToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
-  else if (NS_HexToRGB(cbuf, &rgb)) {
+  else if (NS_HexToRGB(aColor, &rgb)) {
     SetColor(rgb);
   }
   return NS_OK;