From 77ac7a9f817ef7f7365060d064cbef86d133c5f3 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 12 Jun 2003 09:43:27 +0000 Subject: INTEGRATION: CWS mh11rc (1.3.48); FILE MERGED 2003/06/06 13:06:43 mh 1.3.48.1: join: from cws_srx644_ooo11beta2 --- UnoControls/inc/basecontrol.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'UnoControls/inc') diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 5c66dfe16be6..2a793824371b 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: basecontrol.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2001-09-27 11:28:18 $ + * last change: $Author: vg $ $Date: 2003-06-12 10:43:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -380,7 +380,7 @@ namespace unocontrols{ //____________________________________________________________________________________________________________ #define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \ - ((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE##))))|(((sal_uInt32)((sal_uInt8)(GREEN##)))<<8)|(((sal_uInt32)((sal_uInt8)(RED##)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE##)))<<24)) + ((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24)) //____________________________________________________________________________________________________________ // structs -- cgit