diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-16 15:24:43 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-16 15:24:43 +0100 |
commit | 998252dc18a9d1b9a386f9eb95d089d7a9db8c0c (patch) | |
tree | d36f66c41c2a38a412f20b8e900631db1357f61f /svx | |
parent | a17aed79b4baa1460231ce939f87f38758f1508a (diff) |
Remove more *sch High contrast image uses
Diffstat (limited to 'svx')
-rwxr-xr-x | svx/inc/svx/dialogs.hrc | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 20 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 35 |
3 files changed, 8 insertions, 55 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 84d10323be..e337502c03 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -344,14 +344,6 @@ #define RID_SVXDLG_RUBY (RID_SVX_START + 247) -#define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276) -#define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277) -#define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278) -#define RID_SVXIMG_GRAF_LUMINANCE_H (RID_SVX_START + 279) -#define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280) -#define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281) -#define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282) - #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286) #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 9ad40d548b..c60a25d1a3 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -253,20 +253,19 @@ struct CommandToRID { const char* pCommand; USHORT nResId; - USHORT nHCResId; }; static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast ) { static const CommandToRID aImplCommandToResMap[] = { - { ".uno:GrafRed", RID_SVXIMG_GRAF_RED, RID_SVXIMG_GRAF_RED_H }, - { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN, RID_SVXIMG_GRAF_GREEN_H }, - { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE, RID_SVXIMG_GRAF_BLUE_H }, - { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE, RID_SVXIMG_GRAF_LUMINANCE_H }, - { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST, RID_SVXIMG_GRAF_CONTRAST_H }, - { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA, RID_SVXIMG_GRAF_GAMMA_H }, - { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE, RID_SVXIMG_GRAF_TRANSPARENCE_H }, + { ".uno:GrafRed", RID_SVXIMG_GRAF_RED }, + { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN }, + { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE }, + { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE }, + { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST }, + { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA }, + { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE }, { 0, 0, 0 } }; @@ -277,10 +276,7 @@ static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast ) { if ( aCommand.equalsAscii( aImplCommandToResMap[ i ].pCommand )) { - if ( bHighContrast ) - nRID = aImplCommandToResMap[ i ].nHCResId; - else - nRID = aImplCommandToResMap[ i ].nResId; + nRID = aImplCommandToResMap[ i ].nResId; break; } ++i; diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index f43e6ab957..4df0442823 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -134,41 +134,6 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE ImageBitmap = Bitmap { File = "sc10869.bmp" ; }; MASKCOLOR }; -Image RID_SVXIMG_GRAF_RED_H -{ - ImageBitmap = Bitmap { File = "sch10865.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_GREEN_H -{ - ImageBitmap = Bitmap { File = "sch10866.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_BLUE_H -{ - ImageBitmap = Bitmap { File = "sch10867.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_LUMINANCE_H -{ - ImageBitmap = Bitmap { File = "sch10863.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_CONTRAST_H -{ - ImageBitmap = Bitmap { File = "sch10864.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_GAMMA_H -{ - ImageBitmap = Bitmap { File = "sch10868.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_TRANSPARENCE_H -{ - ImageBitmap = Bitmap { File = "sch10869.bmp" ; }; - MASKCOLOR -}; String RID_SVXSTR_CLEARFORM { Text [ en-US ] = "Clear formatting"; |