diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-29 15:33:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-29 15:33:56 +0000 |
| commit | 331241fb1aacd89db473580d2a06e757da72ea12 (patch) | |
| tree | 361a525105073b161340b0866933c049f8d59f8d /svx/source/dialog/dlgctrl.cxx | |
| parent | a69a01fcb415209a53236dae31cb8c658cec95a8 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes61
2009-07-22 10:53:14 +0200 cmc r274224 : #i103714# duplicate patch
2009-07-22 10:45:26 +0200 cmc r274223 : #i103715# fix up m68k makefile.mk
2009-07-22 10:32:16 +0200 cmc r274222 : #i103714# || && new gcc warnings
2009-07-21 13:29:17 +0200 cmc r274190 : #i103651# fix for subpixel gray line in cairo canvas animations
2009-07-20 17:35:58 +0200 cmc r274151 : #i103668# WaE over use of const
2009-07-20 15:53:51 +0200 cmc r274146 : #i103664# use boost::addressof instead
2009-07-20 15:38:40 +0200 cmc r274145 : #i103451# long -> INT32 for these streamable values
2009-07-20 15:33:15 +0200 cmc r274144 : #i103663 clear low-hanging aliasing warnings
2009-07-20 15:28:23 +0200 cmc r274143 : #i103662 clear low-hanging aliasing warnings
2009-07-20 15:21:46 +0200 cmc r274142 : #i103661 clear low-hanging aliasing warnings
2009-07-20 15:16:05 +0200 cmc r274141 : #i103660 clear low-hanging aliasing warnings
Diffstat (limited to 'svx/source/dialog/dlgctrl.cxx')
| -rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index beef4fe8ae48..59d0c721b560 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -173,24 +173,22 @@ void SvxRectCtl::InitRectBitmap( void ) pBitmap = new Bitmap( SVX_RES( RID_SVXCTRL_RECTBTNS ) ); // set bitmap-colors - long aTempAry1[(7*sizeof(Color))/sizeof(long)]; - long aTempAry2[(7*sizeof(Color))/sizeof(long)]; - Color* pColorAry1 = (Color*)aTempAry1; - Color* pColorAry2 = (Color*)aTempAry2; - pColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 ); // light-gray - pColorAry1[1] = Color( 0xFF, 0xFF, 0x00 ); // yellow - pColorAry1[2] = Color( 0xFF, 0xFF, 0xFF ); // white - pColorAry1[3] = Color( 0x80, 0x80, 0x80 ); // dark-gray - pColorAry1[4] = Color( 0x00, 0x00, 0x00 ); // black - pColorAry1[5] = Color( 0x00, 0xFF, 0x00 ); // green - pColorAry1[6] = Color( 0x00, 0x00, 0xFF ); // blue - pColorAry2[0] = rStyles.GetDialogColor(); // background - pColorAry2[1] = rStyles.GetWindowColor(); - pColorAry2[2] = rStyles.GetLightColor(); - pColorAry2[3] = rStyles.GetShadowColor(); - pColorAry2[4] = rStyles.GetDarkShadowColor(); - pColorAry2[5] = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ); - pColorAry2[6] = rStyles.GetDialogColor(); + Color aColorAry1[7]; + Color aColorAry2[7]; + aColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 ); // light-gray + aColorAry1[1] = Color( 0xFF, 0xFF, 0x00 ); // yellow + aColorAry1[2] = Color( 0xFF, 0xFF, 0xFF ); // white + aColorAry1[3] = Color( 0x80, 0x80, 0x80 ); // dark-gray + aColorAry1[4] = Color( 0x00, 0x00, 0x00 ); // black + aColorAry1[5] = Color( 0x00, 0xFF, 0x00 ); // green + aColorAry1[6] = Color( 0x00, 0x00, 0xFF ); // blue + aColorAry2[0] = rStyles.GetDialogColor(); // background + aColorAry2[1] = rStyles.GetWindowColor(); + aColorAry2[2] = rStyles.GetLightColor(); + aColorAry2[3] = rStyles.GetShadowColor(); + aColorAry2[4] = rStyles.GetDarkShadowColor(); + aColorAry2[5] = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ); + aColorAry2[6] = rStyles.GetDialogColor(); #ifdef DBG_UTIL static BOOL bModify = FALSE; @@ -205,11 +203,11 @@ void SvxRectCtl::InitRectBitmap( void ) UINT8& rr = r; UINT8& rg = g; UINT8& rb = b; - pColorAry2[ rn ] = Color( rr, rg, rb ); + aColorAry2[ rn ] = Color( rr, rg, rb ); } #endif - pBitmap->Replace( pColorAry1, pColorAry2, 7, NULL ); + pBitmap->Replace( aColorAry1, aColorAry2, 7, NULL ); } // ----------------------------------------------------------------------- |