Re: [Libreoffice] HTML_ColorEntry sal_uLong->sal_uInt32

Am 16.05.2011 17:05, schrieb Michael Meeks:
> On Fri, 2011-05-06 at 21:53 +0200, Chr. Rossmanith wrote:
> > I think the variable nColor from struct HTML_ColorEntry in htmlkywd.cxx
> > can be changed from sal_uLong to sal_uInt32. Continue to change return
> > type of GetHTMLColor as well and remove #include<tools/solar.h>
> > afterwards (was playing with include-what-you-use which tells me which
> > #include is used for which purpose).
>         Can we read the patch ? :-)
Of course. Find it attached.

Christina

From 97379be0780b2640b21001b1d57914580ee541ec Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Tue, 17 May 2011 09:26:35 +0200
Subject: [PATCH] Changed HTML_ColorEntry.nColor to sal_uInt32

---
 svtools/source/svhtml/htmlkywd.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index de810c7..c45d7e0 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -855,7 +855,7 @@ struct HTML_ColorEntry
         const sal_Char* sName;
         const String *pUName;
     };
-    sal_uLong nColor;
+    sal_uInt32 nColor;
 };
 
 // Flag: color table has already been sorted
@@ -1046,7 +1046,7 @@ static int
 
 }
 
-sal_uLong GetHTMLColor( const String& rName )
+sal_uInt32 GetHTMLColor( const String& rName )
 {
     if( !bSortColorKeyWords )
     {
@@ -1057,7 +1057,7 @@ sal_uLong GetHTMLColor( const String& rName )
         bSortColorKeyWords = sal_True;
     }
 
-    sal_uLong nRet = ULONG_MAX;
+    sal_uInt32 nRet = HTML_NO_COLOR;
     void* pFound;
     HTML_ColorEntry aSrch;
     aSrch.pUName = &rName;
-- 
1.7.0.4