Remove all traces of _HC (high contrast) from libs-core

This compiles successfully, but is otherwise only lightly tested.

29 files changed, 41 insertions, 334 deletions

diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index 081958ccd42c..f69ab937f5f5 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -48,6 +48,4 @@
 #define AVMEDIA_IMG_MUTE        2054
 
 #define AVMEDIA_IMGLST          3072
-#define AVMEDIA_IMGLST_HC       3073
 #define AVMEDIA_IMGLST_L        3074
-#define AVMEDIA_IMGLST_L_HC     3075
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 2ad203e2c34f..22ddc29b3550 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -32,92 +32,66 @@ String AVMEDIA_STR_OPEN
     Text[en-US] = "Open";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_INSERT
 {
     Text [ en-US ] = "Apply" ;
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_PLAY
 {
     Text[en-US] = "Play";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_PAUSE
 {
     Text[en-US] = "Pause";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_STOP
 {
     Text[en-US] = "Stop";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ENDLESS
 {
     Text[en-US] = "Repeat";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_MUTE
 {
     Text[en-US] = "Mute";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM
 {
     Text[en-US] = "View";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_50
 {
     Text[en-US] = "50%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_100
 {
     Text[en-US] = "100%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_200
 {
     Text[en-US] = "200%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_FIT
 {
     Text[en-US] = "Scaled";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_MEDIAPLAYER
 {
     Text[en-US] = "Media Player";
 };
 
-// ------------------------------------------------------------------------------
-
 ImageList AVMEDIA_IMGLST
 {
     Prefix = "av";
@@ -135,8 +109,6 @@ ImageList AVMEDIA_IMGLST
     IdCount = 7;
 };
 
-// ------------------------------------------------------------------------------
-
 ImageList AVMEDIA_IMGLST_L
 {
     Prefix = "avl";
@@ -153,41 +125,3 @@ ImageList AVMEDIA_IMGLST_L
     };
     IdCount = 7;
 };
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_HC
-{
-    Prefix = "avh";
-    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
-    IdList =
-    {
-        AVMEDIA_IMG_OPEN;
-        AVMEDIA_IMG_PLAY;
-        AVMEDIA_IMG_PAUSE;
-        AVMEDIA_IMG_STOP;
-        AVMEDIA_IMG_ENDLESS;
-        AVMEDIA_IMG_INSERT;
-        AVMEDIA_IMG_MUTE;
-    };
-    IdCount = 7;
-};
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_L_HC
-{
-    Prefix = "avlh";
-    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
-    IdList =
-    {
-        AVMEDIA_IMG_OPEN;
-        AVMEDIA_IMG_PLAY;
-        AVMEDIA_IMG_PAUSE;
-        AVMEDIA_IMG_STOP;
-        AVMEDIA_IMG_ENDLESS;
-        AVMEDIA_IMG_INSERT;
-        AVMEDIA_IMG_MUTE;
-    };
-    IdCount = 7;
-};
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 370996c710ae..22492cd8ae88 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -40,27 +40,19 @@
 
 #define RID_DEPLOYMENT_BUNDLE_START          (RID_DEPLOYMENT_START+2000)
 #define RID_IMG_DEF_PACKAGE_BUNDLE           RID_DEPLOYMENT_BUNDLE_START
-#define RID_IMG_DEF_PACKAGE_BUNDLE_HC        (RID_DEPLOYMENT_BUNDLE_START+1)
 
 #define RID_DEPLOYMENT_SCRIPT_START          (RID_DEPLOYMENT_START+2500)
 #define RID_IMG_SCRIPTLIB                    RID_DEPLOYMENT_SCRIPT_START
-#define RID_IMG_SCRIPTLIB_HC                 (RID_DEPLOYMENT_SCRIPT_START+1)
 #define RID_IMG_DIALOGLIB                    (RID_DEPLOYMENT_SCRIPT_START+2)
-#define RID_IMG_DIALOGLIB_HC                 (RID_DEPLOYMENT_SCRIPT_START+3)
 
 #define RID_DEPLOYMENT_CONF_START            (RID_DEPLOYMENT_START+3000)
 #define RID_IMG_CONF_XML                     RID_DEPLOYMENT_CONF_START
-#define RID_IMG_CONF_XML_HC                  (RID_DEPLOYMENT_CONF_START+1)
 
 #define RID_DEPLOYMENT_COMPONENT_START       (RID_DEPLOYMENT_START+3500)
 #define RID_IMG_COMPONENT                    RID_DEPLOYMENT_COMPONENT_START
-#define RID_IMG_COMPONENT_HC                 (RID_DEPLOYMENT_COMPONENT_START+1)
 #define RID_IMG_JAVA_COMPONENT               (RID_DEPLOYMENT_COMPONENT_START+2)
-#define RID_IMG_JAVA_COMPONENT_HC            (RID_DEPLOYMENT_COMPONENT_START+3)
 #define RID_IMG_TYPELIB                      (RID_DEPLOYMENT_COMPONENT_START+4)
-#define RID_IMG_TYPELIB_HC                   (RID_DEPLOYMENT_COMPONENT_START+5)
 #define RID_IMG_JAVA_TYPELIB                 (RID_DEPLOYMENT_COMPONENT_START+6)
-#define RID_IMG_JAVA_TYPELIB_HC              (RID_DEPLOYMENT_COMPONENT_START+7)
 
 #define RID_DEPLOYMENT_UNOPKG_START          (RID_DEPLOYMENT_START+4000)
 #define RID_STR_UNOPKG_ACCEPT_LIC_1          (RID_DEPLOYMENT_UNOPKG_START+1)
@@ -83,5 +75,4 @@
 
 #define RID_DEPLOYMENT_HELP_START           (RID_DEPLOYMENT_START+5000)
 #define RID_IMG_HELP                        RID_DEPLOYMENT_HELP_START
-#define RID_IMG_HELP_HC                     (RID_DEPLOYMENT_HELP_START+1)
 #endif
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 4d554ab4ded9..e5adb84ba596 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
@@ -33,11 +33,6 @@ Image RID_IMG_DEF_PACKAGE_BUNDLE
     ImageBitmap = Bitmap { File = "sx03256.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_DEF_PACKAGE_BUNDLE_HC
-{
-    ImageBitmap = Bitmap { File = "sxh03256.bmp"; };
-    MASKCOLOR
-};
 
 // script, dialog:
 Image RID_IMG_SCRIPTLIB
@@ -45,22 +40,12 @@ Image RID_IMG_SCRIPTLIB
     ImageBitmap = Bitmap { File = "im30820.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_SCRIPTLIB_HC
-{
-    ImageBitmap = Bitmap { File = "imh30820.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_DIALOGLIB
 {
     ImageBitmap = Bitmap { File = "dialogfolder_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_DIALOGLIB_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfolder_16_h.bmp"; };
-    MASKCOLOR
-};
 
 // configuration:
 Image RID_IMG_CONF_XML
@@ -68,11 +53,6 @@ Image RID_IMG_CONF_XML
     ImageBitmap = Bitmap { File = "xml_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_CONF_XML_HC
-{
-    ImageBitmap = Bitmap { File = "xml_16_h.bmp"; };
-    MASKCOLOR
-};
 
 // component, typelib:
 Image RID_IMG_COMPONENT
@@ -80,52 +60,27 @@ Image RID_IMG_COMPONENT
     ImageBitmap = Bitmap { File = "component_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_COMPONENT_HC
-{
-    ImageBitmap = Bitmap { File = "component_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_JAVA_COMPONENT
 {
     ImageBitmap = Bitmap { File = "javacomponent_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_JAVA_COMPONENT_HC
-{
-    ImageBitmap = Bitmap { File = "javacomponent_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_TYPELIB
 {
     ImageBitmap = Bitmap { File = "library_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_TYPELIB_HC
-{
-    ImageBitmap = Bitmap { File = "library_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_JAVA_TYPELIB
 {
     ImageBitmap = Bitmap { File = "javalibrary_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_JAVA_TYPELIB_HC
-{
-    ImageBitmap = Bitmap { File = "javalibrary_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_HELP
 {
     ImageBitmap = Bitmap { File = "commandimagelist/sc_helperdialog.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_HELP_HC
-{
-    ImageBitmap = Bitmap { File = "commandimagelist/sch_helperdialog.bmp"; };
-    MASKCOLOR
-};
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 535e261f7b1b..1cda30d69297 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -520,16 +520,14 @@ BackendImpl::BackendImpl(
                                    getPlatformString(),
                                    OUSTR("*" SAL_DLLEXTENSION),
                                    getResourceString(RID_STR_DYN_COMPONENT),
-                                   RID_IMG_COMPONENT,
-                                   RID_IMG_COMPONENT_HC ) ),
+                                   RID_IMG_COMPONENT) ),
       m_xJavaComponentTypeInfo( new Package::TypeInfo(
                                     OUSTR("application/"
                                           "vnd.sun.star.uno-component;"
                                           "type=Java"),
                                     OUSTR("*.jar"),
                                     getResourceString(RID_STR_JAVA_COMPONENT),
-                                    RID_IMG_JAVA_COMPONENT,
-                                    RID_IMG_JAVA_COMPONENT_HC ) ),
+                                    RID_IMG_JAVA_COMPONENT) ),
       m_xPythonComponentTypeInfo( new Package::TypeInfo(
                                       OUSTR("application/"
                                             "vnd.sun.star.uno-component;"
@@ -537,23 +535,21 @@ BackendImpl::BackendImpl(
                                       OUSTR("*.py"),
                                       getResourceString(
                                           RID_STR_PYTHON_COMPONENT),
-                                      RID_IMG_COMPONENT,
-                                      RID_IMG_COMPONENT_HC ) ),
+                                      RID_IMG_COMPONENT ) ),
       m_xRDBTypelibTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.uno-typelibrary;"
                                        "type=RDB"),
                                  OUSTR("*.rdb"),
                                  getResourceString(RID_STR_RDB_TYPELIB),
-                                 RID_IMG_TYPELIB, RID_IMG_TYPELIB_HC ) ),
+                                 RID_IMG_TYPELIB ) ),
       m_xJavaTypelibTypeInfo( new Package::TypeInfo(
                                   OUSTR("application/"
                                         "vnd.sun.star.uno-typelibrary;"
                                         "type=Java"),
                                   OUSTR("*.jar"),
                                   getResourceString(RID_STR_JAVA_TYPELIB),
-                                  RID_IMG_JAVA_TYPELIB,
-                                  RID_IMG_JAVA_TYPELIB_HC ) ),
+                                  RID_IMG_JAVA_TYPELIB ) ),
       m_typeInfos( 5 )
 {
     m_typeInfos[ 0 ] = m_xDynComponentTypeInfo;
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 5d89c2deca24..18769bea8b3c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -185,13 +185,13 @@ BackendImpl::BackendImpl(
                                      "vnd.sun.star.configuration-data"),
                                OUSTR("*.xcu"),
                                getResourceString(RID_STR_CONF_DATA),
-                               RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ),
+                               RID_IMG_CONF_XML ) ),
       m_xConfSchemaTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.configuration-schema"),
                                  OUSTR("*.xcs"),
                                  getResourceString(RID_STR_CONF_SCHEMA),
-                                 RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ),
+                                 RID_IMG_CONF_XML ) ),
       m_typeInfos( 2 )
 {
     m_typeInfos[ 0 ] = m_xConfDataTypeInfo;
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 09a6a04651bf..6d569b0952ad 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -797,12 +797,19 @@ OUString Package::TypeInfo::getFileFilter() throw (RuntimeException)
 }
 
 //______________________________________________________________________________
+/**************************
+ * Get Icon
+ *
+ * @param highContrast NOTE: disabled the returning of high contrast icons.
+ *                     This bool is a noop now.
+ * @param smallIcon    Return the small version of the icon
+ */
 Any Package::TypeInfo::getIcon( sal_Bool highContrast, sal_Bool smallIcon )
     throw (RuntimeException)
 {
     if (! smallIcon)
         return Any();
-    const sal_uInt16 nIconId = (highContrast ? m_smallIcon_HC : m_smallIcon);
+    const sal_uInt16 nIconId = m_smallIcon;
     return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) );
 }
 
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index b120bd9a4465..1b05a3fae184 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -118,8 +118,7 @@ BackendImpl::BackendImpl(
                                 OUSTR("application/vnd.sun.star.executable"),
                                 OUSTR(""),
                                 OUSTR("Executable"),
-                                RID_IMG_COMPONENT,
-                                RID_IMG_COMPONENT_HC ) )
+                                RID_IMG_COMPONENT ) )
 {
     if (!transientMode())
     {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 9e6d6dfe725a..d69e5698b7a4 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -135,7 +135,7 @@ BackendImpl::BackendImpl(
                                OUSTR("application/vnd.sun.star.help"),
                                rtl::OUString(),
                                getResourceString(RID_STR_HELP),
-                               RID_IMG_HELP, RID_IMG_HELP_HC ) ),
+                               RID_IMG_HELP ) ),
       m_typeInfos( 1 )
 {
     m_typeInfos[ 0 ] = m_xHelpTypeInfo;
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 10b6d6a236ab..45a2938c0524 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -121,16 +121,16 @@ public:
         const ::rtl::OUString m_mediaType;
         const ::rtl::OUString m_fileFilter;
         const ::rtl::OUString m_shortDescr;
-        const sal_uInt16 m_smallIcon, m_smallIcon_HC;
+        const sal_uInt16 m_smallIcon;
     public:
         virtual ~TypeInfo();
         TypeInfo( ::rtl::OUString const & mediaType,
                   ::rtl::OUString const & fileFilter,
                   ::rtl::OUString const & shortDescr,
-                  sal_uInt16 smallIcon, sal_uInt16 smallIcon_HC )
+                  sal_uInt16 smallIcon)
             : m_mediaType(mediaType), m_fileFilter(fileFilter),
               m_shortDescr(shortDescr),
-              m_smallIcon(smallIcon), m_smallIcon_HC(smallIcon_HC)
+              m_smallIcon(smallIcon))
             {}
         // XPackageTypeInfo
         virtual ::rtl::OUString SAL_CALL getMediaType()
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 73b0ce15cd23..6e58e5c6b802 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -301,15 +301,13 @@ BackendImpl::BackendImpl(
                              OUSTR("application/vnd.sun.star.package-bundle"),
                              OUSTR("*.oxt;*.uno.pkg"),
                              getResourceString(RID_STR_PACKAGE_BUNDLE),
-                             RID_IMG_DEF_PACKAGE_BUNDLE,
-                             RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
+                             RID_IMG_DEF_PACKAGE_BUNDLE ) ),
       m_xLegacyBundleTypeInfo( new Package::TypeInfo(
                                    OUSTR("application/"
                                          "vnd.sun.star.legacy-package-bundle"),
                                    OUSTR("*.zip"),
                                    m_xBundleTypeInfo->getShortDescription(),
-                                   RID_IMG_DEF_PACKAGE_BUNDLE,
-                                   RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
+                                   RID_IMG_DEF_PACKAGE_BUNDLE ) ),
     m_typeInfos(2)
 {
     m_typeInfos[ 0 ] = m_xBundleTypeInfo;
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index d578ffcf0c40..18198c2c8342 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -164,13 +164,13 @@ BackendImpl::BackendImpl(
                                      "vnd.sun.star.basic-library"),
                                OUString() /* no file filter */,
                                getResourceString(RID_STR_BASIC_LIB),
-                               RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) ),
+                               RID_IMG_SCRIPTLIB) ),
       m_xDialogLibTypeInfo( new Package::TypeInfo(
                                 OUSTR("application/"
                                       "vnd.sun.star.dialog-library"),
                                 OUString() /* no file filter */,
                                 getResourceString(RID_STR_DIALOG_LIB),
-                                RID_IMG_DIALOGLIB, RID_IMG_DIALOGLIB_HC ) ),
+                                RID_IMG_DIALOGLIB) ),
       m_typeInfos( 2 )
 {
     m_typeInfos[ 0 ] = m_xBasicLibTypeInfo;
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 63296dd12c1a..7904331ef11b 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -168,7 +168,7 @@ BackendImpl::BackendImpl(
                        OUSTR("application/vnd.sun.star.framework-script"),
                        OUString() /* no file filter */,
                        OUSTR("Scripting Framework Script Library"),
-                       RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) )
+                       RID_IMG_SCRIPTLIB ) )
 {
     if (! transientMode())
     {
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 9ccf1c8ebb3d..4c2b2b687321 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -39,8 +39,6 @@ enum ImageType
 {
     ImageType_Color = 0,
     ImageType_Color_Large,
-    ImageType_HC,
-    ImageType_HC_Large,
     ImageType_COUNT
 };
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 51112cc6764e..ac901dcd1e49 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -427,8 +427,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra
     Size   aSize = aImage.GetSizePixel();
     bool   bMustScale( false );
 
-    if (( nImageType == ImageType_Color_Large ) ||
-        ( nImageType == ImageType_HC_Large ))
+    if ( nImageType == ImageType_Color_Large )
         bMustScale = ( aSize != aLargeSize );
     else
         bMustScale = ( aSize != aNormSize );
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 8762f839b781..aa758a161252 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -91,61 +91,30 @@
                     <label>Spell and grammar dialog image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarDialogImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking dialog in high contrast mode.</desc>
-                    <label>Spell and grammar dialog image</label>
-                </info>
-            </prop>
             <prop oor:name="SpellAndGrammarContextMenuSuggestionImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the spell and grammar checking suggestions in the context menu context menu.</desc>
                     <label>Spell and grammar context menu suggestions image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarContextMenuSuggestionImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking suggestions in the context menu context menu in high contrast mode.</desc>
-                    <label>Spell and grammar context menu suggestions image</label>
-                </info>
-            </prop>
             <prop oor:name="SpellAndGrammarContextMenuDictionaryImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the spell and grammar checking context menu context menu.</desc>
                     <label>Spell and grammar context menu dictionary image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarContextMenuDictionaryImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking context menu in high contrast mode.</desc>
-                    <label>Spell and grammar context menu dictionary image</label>
-                </info>
-            </prop>
             <prop oor:name="ThesaurusDialogImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the thesaurus dialog.</desc>
                     <label>Thesaurus dialog image</label>
                 </info>
             </prop>
-            <prop oor:name="ThesaurusDialogImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the thesaurus dialog in high contrast mode.</desc>
-                    <label>Thesaurus dialog image</label>
-                </info>
-            </prop>
             <prop oor:name="SynonymsContextMenuImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the synonyms context menu.</desc>
                     <label>Synonyms context menu image</label>
                 </info>
             </prop>
-            <prop oor:name="SynonymsContextMenuImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the synonyms context menu in high contrast mode.</desc>
-                    <label>Synonyms context menu image</label>
-                </info>
-            </prop>
-
         </group>
 
         <group oor:name="GrammarCheckerEntry">
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index a52cfe3d8edf..36d5564148df 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1770,7 +1770,6 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) :
     m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY );
 
     m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ), BMP_COLOR_NORMAL );
-    m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE_HC ), BMP_COLOR_HIGHCONTRAST );
 }
 
 void CustomPropertyLine::SetRemoved()
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 53b0f35685cb..ddc76d54ce19 100755
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -672,11 +672,6 @@ Image SFX_IMG_PROPERTY_REMOVE
     ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
-Image SFX_IMG_PROPERTY_REMOVE_HC
-{
-    ImageBitmap = Bitmap { File = "deleterow_h.bmp" ; };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
 
 QueryBox SFX_QB_WRONG_TYPE
 {
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 5bdde1f57ab6..7c35f2106cee 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -30,7 +30,6 @@
 
  // -----------------------------------------------------------------------
 #define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-#define STD_HC_MASKCOLOR Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
 
 FloatingWindow SID_RECORDING_FLOATWINDOW
 {
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 1176936cb3e7..5f3507334fac 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -62,14 +62,6 @@
 #define BMP_STYLES_FAMILY3                  (RID_SFX_DOC_START+ 4)
 #define BMP_STYLES_FAMILY4                  (RID_SFX_DOC_START+ 5)
 
-#define BMP_STYLES_CLOSED_HC                (RID_SFX_DOC_START+ 6)
-#define BMP_STYLES_OPENED_HC                (RID_SFX_DOC_START+ 7)
-
-#define BMP_STYLES_FAMILY1_HC               (RID_SFX_DOC_START+ 8)
-#define BMP_STYLES_FAMILY2_HC               (RID_SFX_DOC_START+ 9)
-#define BMP_STYLES_FAMILY3_HC               (RID_SFX_DOC_START+ 10)
-#define BMP_STYLES_FAMILY4_HC               (RID_SFX_DOC_START+ 11)
-
 #define STR_STYLES                          (RID_SFX_DOC_START+ 18)
 #define STR_MACROS                          (RID_SFX_DOC_START+ 19)
 
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index be025879318d..10d264181288 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -72,9 +72,6 @@ String STR_QUERY_SAVE_DOCUMENT
 Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
 Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
 
-Bitmap BMP_STYLES_CLOSED_HC { File = "newex_h.bmp" ; };
-Bitmap BMP_STYLES_OPENED_HC { File = "newex_h.bmp" ; };
-
 String STR_STYLES
 {
     Text [ en-US ] = "Styles" ;
@@ -100,11 +97,6 @@ Bitmap BMP_STYLES_FAMILY2 { File = "styfam2.bmp" ; };
 Bitmap BMP_STYLES_FAMILY3 { File = "styfam3.bmp" ; };
 Bitmap BMP_STYLES_FAMILY4 { File = "styfam4.bmp" ; };
 
-Bitmap BMP_STYLES_FAMILY1_HC { File = "styfam1_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY2_HC { File = "styfam2_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY3_HC { File = "styfam3_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY4_HC { File = "styfam4_h.bmp" ; };
-
 ErrorBox MSG_PRINT_ERROR
 {
     BUTTONS = WB_OK ;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 23000346edf4..ea3b383982fc 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -104,19 +104,13 @@ public:
 
 
 inline void SfxOrganizeListBox_Impl::SetBitmaps(
-    const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc,
-    const Image &rOFolderHC, const Image &rCFolderHC, const Image &rODocHC, const Image &rCDocHC )
+    const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc )
 {
     aOpenedFolderBmp = rOFolder;
     aClosedFolderBmp = rCFolder;
     aOpenedDocBmp = rODoc;
     aClosedDocBmp = rCDoc;
 
-    aOpenedFolderBmpHC = rOFolderHC;
-    aClosedFolderBmpHC = rCFolderHC;
-    aOpenedDocBmpHC = rODocHC;
-    aClosedDocBmpHC = rCDocHC;
-
 }
 
 //=========================================================================
@@ -325,15 +319,8 @@ void SfxOrganizeDlg_Impl::InitBitmaps( void )
     Image   aOpenedDocBmp( SfxResId( IMG_OPENED_DOC ) );
     Image   aClosedDocBmp( SfxResId( IMG_CLOSED_DOC ) );
 
-    Image   aOpenedFolderBmpHC( SfxResId( IMG_OPENED_FOLDER_HC ) );
-    Image   aClosedFolderBmpHC( SfxResId( IMG_CLOSED_FOLDER_HC ) );
-    Image   aOpenedDocBmpHC( SfxResId( IMG_OPENED_DOC_HC ) );
-    Image   aClosedDocBmpHC( SfxResId( IMG_CLOSED_DOC_HC ) );
-
-    aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
-                        aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
-    aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
-                        aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
+    aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
+    aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
 }
 
 //=========================================================================
@@ -1472,15 +1459,16 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL            bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image*    pRet = NULL;
 
     switch( nLevel )
     {
         default:    DBG_ERROR( "Bitmaps ueberindiziert" );
 
-        case 0:     pRet = bHC? &aClosedFolderBmpHC : &aClosedFolderBmp;        break;
-        case 1:     pRet = bHC? &aClosedDocBmpHC : &aClosedDocBmp;              break;
+        case 0:     pRet = &aClosedFolderBmp;
+            break;
+        case 1:     pRet = &aClosedDocBmp;
+            break;
     }
 
     return *pRet;
diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index 842aa73fb8a3..c17f424a2a90 100644
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.hrc
@@ -29,10 +29,6 @@
 #define IMG_CLOSED_FOLDER       1
 #define IMG_OPENED_DOC          3
 #define IMG_CLOSED_DOC          4
-#define IMG_OPENED_FOLDER_HC    5
-#define IMG_CLOSED_FOLDER_HC    6
-#define IMG_OPENED_DOC_HC       7
-#define IMG_CLOSED_DOC_HC       8
 
 #define ACC_EDIT 1
 #define ID_COPY 201
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 2c9975de9bb8..0c82ba60638c 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -259,57 +259,4 @@ ModalDialog DLG_ORGANIZE
         MASKCOLOR ;
         ImageBitmap = Bitmap { File = "doccl.bmp" ; } ;
     };
-    Image IMG_OPENED_FOLDER_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "folderop_h.bmp" ; } ;
-    };
-    Image IMG_CLOSED_FOLDER_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "foldercl_h.bmp" ; } ;
-    };
-    Image IMG_OPENED_DOC_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
-    };
-    Image IMG_CLOSED_DOC_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
-    };
-    /*    FixedText FT_DEFAULT_TEMPLATE_LABEL
-    {
-        Pos = MAP_APPFONT ( 3 , 161 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "Default template:" ;
-    };
-    FixedText FT_DEFAULT_TEMPLATE
-    {
-        Pos = MAP_APPFONT ( 66 , 161 ) ;
-        Size = MAP_APPFONT ( 131 , 10 ) ;
-    };*/
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index f7712651c330..a98a2723b15d 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -437,37 +437,14 @@ void   SfxObjectShell::GetContent(String &rText,
             {
                 case CONTENT_STYLE:
                     nTextResId = STR_STYLES;
-                    if ( eColorMode == BMP_COLOR_NORMAL )
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED;
-                    }
-                    else
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
-                    }
+                    nClosedBitmapResId= BMP_STYLES_CLOSED;
+                    nOpenedBitmapResId= BMP_STYLES_OPENED;
                     break;
                 case CONTENT_MACRO:
                     nTextResId = STR_MACROS;
-                    if ( eColorMode == BMP_COLOR_NORMAL )
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED;
-                    }
-                    else
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
-                    }
-                    break;
-/*
-                case CONTENT_CONFIG:
-                    nTextResId = STR_CONFIG;
                     nClosedBitmapResId= BMP_STYLES_CLOSED;
                     nOpenedBitmapResId= BMP_STYLES_OPENED;
                     break;
- */
             }
 
             if ( nTextResId )
@@ -493,19 +470,6 @@ void   SfxObjectShell::GetContent(String &rText,
             break;
         case CONTENT_MACRO:
             break;
-/*
-        case CONTENT_CONFIG:
-            if ( GetConfigManager() )
-            {
-                rText = GetConfigManager()->GetItem(i);
-                bCanDel = GetConfigManager()->CanDelete(i);
-            }
-            else
-                rText = String();
-            rClosedBitmap = Bitmap(SfxResId(BMP_STYLES_CLOSED));
-            rOpenedBitmap = Bitmap(SfxResId(BMP_STYLES_OPENED));
-            break;
-*/
     }
 }
 
@@ -524,16 +488,16 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode
     switch(eFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY1 : BMP_STYLES_FAMILY1_HC;
+            nResId = BMP_STYLES_FAMILY1;
             break;
         case SFX_STYLE_FAMILY_PARA:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY2 : BMP_STYLES_FAMILY2_HC;
+            nResId = BMP_STYLES_FAMILY2;
             break;
         case SFX_STYLE_FAMILY_FRAME:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY3 : BMP_STYLES_FAMILY3_HC;
+            nResId = BMP_STYLES_FAMILY3;
             break;
         case SFX_STYLE_FAMILY_PAGE :
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY4 : BMP_STYLES_FAMILY4_HC;
+            nResId = BMP_STYLES_FAMILY4;
             break;
         case SFX_STYLE_FAMILY_PSEUDO:
         case SFX_STYLE_FAMILY_ALL:
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 7096d71fabdc..a6a7d85de0e5 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -67,7 +67,6 @@
 // Images ----------------------------------------------------------------
 
 #define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
-#define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  1)
 #define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
 
 #endif
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/intro_tmpl.hrc
index e49b27cb29e8..f9d3e331bf99 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/intro_tmpl.hrc
@@ -28,7 +28,6 @@
 #include <svx/svxids.hrc>
 
 #define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 
 #define OOO_CONTRIBUTOR_LIST \
 ItemList = \
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index ecadfd9d4c6a..80e1a4ab51ec 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -129,12 +129,6 @@ ImageList RID_IMGLIST_TREEOPT
     MASK_COL
     IMGLST_IDLST
 };
-ImageList RID_IMGLIST_TREEOPT_HC
-{
-    Prefix = "trh";
-    MASK_COL
-    IMGLST_IDLST
-};
 
 #define MASK_COL2   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
 #define X_IMAGE_LIST \
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index d2aaf9d34c30..929ee07b7504 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -248,10 +248,9 @@
 #define RID_BMP_DB_RELATIONS_S          (RID_OFA_START + 172)
 #define RID_BMP_DB_RELATIONS_L          (RID_OFA_START + 173)
 #define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 
-                                        // 12 und 13 nicht benutzen!!!
-// ..._BEGIN kann nochmal benutzt werden, nur zum Iterieren
+// don't use 12 and 13 !!!
+// ..._BEGIN can be used again. Just for iteration here
 #define RID_STR_PRIO_BEGIN              (RID_OFA_START + 17)
 #define RID_STR_PRIO_HIGHEST            (RID_OFA_START + 18)
 #define RID_STR_PRIO_HIGH               (RID_OFA_START + 19)