summaryrefslogtreecommitdiff
path: root/UnoControls
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:27 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:27 +0000
commit058d538cfc004f82533d84cd118faa8c9803385b (patch)
treef7175487ad8f63045c3113bfb6ee81514f370cb1 /UnoControls
parentb035f1b53953dfb875ed1f568a99c746e3971823 (diff)
INTEGRATION: CWS mh11rc (1.3.48); FILE MERGED
2003/06/06 13:06:43 mh 1.3.48.1: join: from cws_srx644_ooo11beta2
Diffstat (limited to 'UnoControls')
-rw-r--r--UnoControls/inc/basecontrol.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 163dafd21..819df45dd 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