summaryrefslogtreecommitdiffstats
path: root/svtools
diff options
context:
space:
mode:
authorChristina Rossmanith <ChrRossmanith@web.de>2011-06-05 20:41:39 +0200
committerChristina Rossmanith <ChrRossmanith@web.de>2011-06-05 20:41:39 +0200
commitfe3dd6d831998dd5619ea223af04bc51f9294d2f (patch)
tree7d3f0f6e6fcc5d338a8dfcf47c22c02ba7e4aec9 /svtools
parentRemoved lines from merge conflicts (diff)
downloadcore-fe3dd6d831998dd5619ea223af04bc51f9294d2f.tar.gz
core-fe3dd6d831998dd5619ea223af04bc51f9294d2f.zip
Changed return type of GetHTMLColor
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/htmltokn.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/inc/svtools/htmltokn.h b/svtools/inc/svtools/htmltokn.h
index 0b7852d27ec2..1ccfca3bd4e9 100644
--- a/svtools/inc/svtools/htmltokn.h
+++ b/svtools/inc/svtools/htmltokn.h
@@ -47,7 +47,7 @@ SVT_DLLPUBLIC int GetHTMLToken( const String& rName );
int GetHTMLOption( const String& rName );
// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX)
-SVT_DLLPUBLIC sal_uIntPtr GetHTMLColor( const String& rName );
+SVT_DLLPUBLIC sal_uInt32 GetHTMLColor( const String& rName );
// beginnen immer ab 256, groesser als ein char
const int HTML_TOKEN_START = 0x100;