[Libreoffice-commits] .: sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Sun Jun 5 12:31:35 PDT 2011
sw/source/filter/html/parcss1.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3cf3d76dbfef202f575b8401b4cec20e0a21c9e8
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Sun Jun 5 21:28:08 2011 +0200
Changed return type of GetHTMLColor
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) );
More information about the Libreoffice-commits
mailing list