All pastes #2075182 Raw Edit

Mine

public text v1 · immutable
#2075182 ·published 2011-06-05 19:11 UTC
rendered paste body
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 66ef97c..d8a80c2 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -256,11 +256,11 @@ void HTMLOption::GetColor( Color& rColor ) const
 
     String aTmp( aValue );
     aTmp.ToUpperAscii();
-    sal_uLong nColor = ULONG_MAX;
+    sal_uInt32 nColor = SAL_MAX_UINT32;
     if( '#'!=aTmp.GetChar( 0 ) )
         nColor = GetHTMLColor( aTmp );
 
-    if( ULONG_MAX == nColor )
+    if( SAL_MAX_UINT32 == nColor )
     {
         nColor = 0;
         xub_StrLen nPos = 0;


diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 6dc1138..5c0955f 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1287,7 +1287,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
                 "CSS1-Ausruck kann keine Farbe sein" );
 
     sal_Bool bRet = sal_False;
-    sal_uLong nColor = ULONG_MAX;
+    sal_uInt32 nColor = SAL_MAX_UINT32;
 
     switch( eType )
     {
@@ -1357,7 +1357,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
             String aTmp( aValue );
             aTmp.ToUpperAscii();
             nColor = GetHTMLColor( aTmp );
-            bRet = nColor != ULONG_MAX;
+            bRet = nColor != SAL_MAX_UINT32;
         }
         if( bRet || CSS1_STRING != eType || !aValue.Len() ||
             aValue.GetChar( 0 )!='#' )
@@ -1402,7 +1402,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
     }
 
 
-    if( bRet && nColor!=ULONG_MAX )
+    if( bRet && nColor!=SAL_MAX_UINT32 )
     {
         rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000UL) >> 16) );
         rColor.SetGreen( (sal_uInt8)((nColor & 0x0000ff00UL) >> 8) );