[Libreoffice-commits] .: starmath/inc starmath/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Tue Nov 16 07:53:12 PST 2010
starmath/inc/starmath.hrc | 11 -------
starmath/source/smres.src | 62 --------------------------------------------
starmath/source/toolbox.cxx | 33 ++++++++---------------
3 files changed, 12 insertions(+), 94 deletions(-)
New commits:
commit 0715767bf6d98c6a1cd07382e398be38182d7971
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Tue Nov 16 16:52:44 2010 +0100
Remove _HC references and images in starmath
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ed670d8..b1db8da 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -162,27 +162,16 @@
#define RID_ERR_OVERFLOW (RID_APP_START + 937)
// toolbox image lists for 'Selection' window
-//!! RID_ILH_XYZ = RID_IL_XYZ + 1 !!
#define RID_IL_CATALOG (RID_APP_START + 950)
-#define RID_ILH_CATALOG (RID_APP_START + 951)
#define RID_IL_UNBINOPS (RID_APP_START + 952)
-#define RID_ILH_UNBINOPS (RID_APP_START + 953)
#define RID_IL_RELATIONS (RID_APP_START + 954)
-#define RID_ILH_RELATIONS (RID_APP_START + 955)
#define RID_IL_SETOPERATIONS (RID_APP_START + 956)
-#define RID_ILH_SETOPERATIONS (RID_APP_START + 957)
#define RID_IL_FUNCTIONS (RID_APP_START + 958)
-#define RID_ILH_FUNCTIONS (RID_APP_START + 959)
#define RID_IL_OPERATORS (RID_APP_START + 960)
-#define RID_ILH_OPERATORS (RID_APP_START + 961)
#define RID_IL_ATTRIBUTES (RID_APP_START + 962)
-#define RID_ILH_ATTRIBUTES (RID_APP_START + 963)
#define RID_IL_BRACKETS (RID_APP_START + 964)
-#define RID_ILH_BRACKETS (RID_APP_START + 965)
#define RID_IL_FORMAT (RID_APP_START + 966)
-#define RID_ILH_FORMAT (RID_APP_START + 967)
#define RID_IL_MISC (RID_APP_START + 968)
-#define RID_ILH_MISC (RID_APP_START + 969)
#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
#define RID_RELATIONS_CAT (RID_APP_START + 1102)
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 7270427..d4493d3 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -3002,12 +3002,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
UNBINOPS_IDLIST
};
- ImageList RID_ILH_UNBINOPS
- {
- Prefix = "unh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- UNBINOPS_IDLIST
- };
#define RELATIONS_IDLIST \
IdList = \
@@ -3042,12 +3036,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
RELATIONS_IDLIST
};
- ImageList RID_ILH_RELATIONS
- {
- Prefix = "bih";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- RELATIONS_IDLIST
- };
#define SETOPERATIONS_IDLIST \
IdList = \
@@ -3083,12 +3071,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
SETOPERATIONS_IDLIST
};
- ImageList RID_ILH_SETOPERATIONS
- {
- Prefix = "oph";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- SETOPERATIONS_IDLIST
- };
#define FUNCTIONS_IDLIST \
IdList = \
@@ -3127,12 +3109,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
FUNCTIONS_IDLIST
};
- ImageList RID_ILH_FUNCTIONS
- {
- Prefix = "fuh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- FUNCTIONS_IDLIST
- };
#define OPERATORS_IDLIST \
IdList = \
@@ -3159,12 +3135,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
OPERATORS_IDLIST
};
- ImageList RID_ILH_OPERATORS
- {
- Prefix = "foh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- OPERATORS_IDLIST
- };
#define ATTRIBUTES_IDLIST \
IdList = \
@@ -3201,12 +3171,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
ATTRIBUTES_IDLIST
};
- ImageList RID_ILH_ATTRIBUTES
- {
- Prefix = "ath";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- ATTRIBUTES_IDLIST
- };
#define BRACKETS_IDLIST \
IdList = \
@@ -3239,12 +3203,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
BRACKETS_IDLIST
};
- ImageList RID_ILH_BRACKETS
- {
- Prefix = "alh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- BRACKETS_IDLIST
- };
#define FORMAT_IDLIST \
IdList = \
@@ -3273,12 +3231,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
FORMAT_IDLIST
};
- ImageList RID_ILH_FORMAT
- {
- Prefix = "coh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- FORMAT_IDLIST
- };
#define MISC_IDLIST \
IdList = \
@@ -3311,12 +3263,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
MISC_IDLIST
};
- ImageList RID_ILH_MISC
- {
- Prefix = "mih";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- MISC_IDLIST
- };
#define CATALOG_IDLIST \
IdList = \
@@ -3339,14 +3285,6 @@ DockingWindow RID_CMDBOXWINDOW\
MaskColor = IMAGE_STDBTN_COLOR ;
CATALOG_IDLIST
};
- ImageList RID_ILH_CATALOG
- {
- Prefix = "imh";
- MaskColor = IMAGE_STDBTN_COLOR_HC ;
- CATALOG_IDLIST
- };
-
-
String STR_CMDBOXWINDOW
{
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index e61d3df..35d9716 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -95,26 +95,17 @@ static USHORT GetCategoryRID( USHORT nResId )
USHORT nRes = 0xFFFF;
switch (nResId)
{
- case RID_IL_UNBINOPS :
- case RID_ILH_UNBINOPS : nRes = RID_UNBINOPS_CAT; break;
- case RID_IL_RELATIONS :
- case RID_ILH_RELATIONS : nRes = RID_RELATIONS_CAT; break;
- case RID_IL_SETOPERATIONS :
- case RID_ILH_SETOPERATIONS : nRes = RID_SETOPERATIONS_CAT; break;
- case RID_IL_FUNCTIONS :
- case RID_ILH_FUNCTIONS : nRes = RID_FUNCTIONS_CAT; break;
- case RID_IL_OPERATORS :
- case RID_ILH_OPERATORS : nRes = RID_OPERATORS_CAT; break;
- case RID_IL_ATTRIBUTES :
- case RID_ILH_ATTRIBUTES : nRes = RID_ATTRIBUTES_CAT; break;
- case RID_IL_BRACKETS :
- case RID_ILH_BRACKETS : nRes = RID_BRACKETS_CAT; break;
- case RID_IL_FORMAT :
- case RID_ILH_FORMAT : nRes = RID_FORMAT_CAT; break;
- case RID_IL_MISC :
- case RID_ILH_MISC : nRes = RID_MISC_CAT; break;
+ case RID_IL_UNBINOPS : nRes = RID_UNBINOPS_CAT; break;
+ case RID_IL_RELATIONS : nRes = RID_RELATIONS_CAT; break;
+ case RID_IL_SETOPERATIONS : nRes = RID_SETOPERATIONS_CAT; break;
+ case RID_IL_FUNCTIONS : nRes = RID_FUNCTIONS_CAT; break;
+ case RID_IL_OPERATORS : nRes = RID_OPERATORS_CAT; break;
+ case RID_IL_ATTRIBUTES : nRes = RID_ATTRIBUTES_CAT; break;
+ case RID_IL_BRACKETS : nRes = RID_BRACKETS_CAT; break;
+ case RID_IL_FORMAT : nRes = RID_FORMAT_CAT; break;
+ case RID_IL_MISC : nRes = RID_MISC_CAT; break;
default :
- if (nResId != RID_IL_CATALOG && nResId != RID_ILH_CATALOG)
+ if (nResId != RID_IL_CATALOG)
{
#if OSL_DEBUG_LEVEL > 1
DBG_ERROR( "unkown category" );
@@ -198,7 +189,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, bool bHighContra
// get index to use
USHORT nCategoryRID = GetCategoryRID( nResId );
sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID );
- if (nIndex == -1 && (nResId == RID_IL_CATALOG || nResId == RID_ILH_CATALOG))
+ if (nIndex == -1 && (nResId == RID_IL_CATALOG))
nIndex = NUM_TBX_CATEGORIES;
if (nIndex >= 0)
@@ -219,7 +210,7 @@ void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID )
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
// set image list for toolbox 'catalog'
- const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast );
+ const ImageList *pImageList = GetImageList( RID_IL_CATALOG, bHighContrast );
OSL_ENSURE( pImageList, "image list missing" );
if (pImageList)
aToolBoxCat.SetImageList( *pImageList );
More information about the Libreoffice-commits
mailing list