High-Contrast Cleanup Phase #1

13 files changed, 161 insertions, 217 deletions

diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 9a10738cae..d636536a3e 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,33 +51,34 @@ namespace framework
 class AddonMenu : public PopupMenu
 {
     public:
-                        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-                        ~AddonMenu();
+        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        ~AddonMenu();
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 };
 
 class AddonMenuManager;
+
 class AddonPopupMenu : public AddonMenu
 {
     public:
-                                ~AddonPopupMenu();
-                        
+        ~AddonPopupMenu();
+
         // Check if command URL string has the unique prefix to identify addon popup menus
         static sal_Bool			IsCommandURLPrefix( const rtl::OUString& aCmdURL );
-        
+
         void                    SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
         const rtl::OUString&    GetCommandURL() const { return m_aCommandURL; }
 
     protected:
-        void					Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
-        
+        void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
+
     private:
-                                AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+        AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+
+        rtl::OUString               m_aCommandURL;
 
-    rtl::OUString               m_aCommandURL;
-        
     friend class AddonMenuManager;
 };
 
@@ -92,9 +93,9 @@ class AddonMenuManager
 
         static sal_Bool   HasAddonMenuElements();
         static sal_Bool   HasAddonHelpMenuElements();
-        
+
         static sal_Bool   IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
-    
+
         // Check if the context string matches the provided xModel context
         static sal_Bool	  IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
 
@@ -103,7 +104,7 @@ class AddonMenuManager
 
         // Create the Add-Ons menu
         static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-        
+
         // Merge the Add-Ons help menu items into the given menu bar at a defined pos
         static void		  MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                               MenuBar* pMergeMenuBar );
@@ -113,16 +114,16 @@ class AddonMenuManager
                                                 const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel,
                                                 USHORT	 nMergeAtPos,
                                                 MenuBar* pMergeMenuBar );
-        
+
         // Returns the next position to insert a menu item/sub menu
         static USHORT     GetNextPos( USHORT nPos );
-        
+
         // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
         static void       BuildMenu( PopupMenu*  pCurrentMenu,
                                      MenuType    nSubMenuType,
                                      USHORT      nInsPos,
                                      USHORT&     nUniqueMenuId,
-                                     com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, 
+                                     com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel );
 
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 7c0a8608bc..840a2b753a 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,25 +54,28 @@ class BmkMenu_Impl;
 class BmkMenu : public AddonMenu
 {
     public:
-                        enum BmkMenuType
-                        { 
-                            BMK_NEWMENU, 
-                            BMK_WIZARDMENU
-                        };
-                        
-                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, 
-                                 BmkMenuType nType );
-                        ~BmkMenu();
-
-    void				Initialize(); // Synchrones Laden der Eintraege
+        enum BmkMenuType
+        {
+            BMK_NEWMENU,
+            BMK_WIZARDMENU
+        };
+
+        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                 BmkMenuType nType
+        );
+
+        ~BmkMenu();
+
+        void Initialize(); // Synchrones Laden der Eintraege
 
     protected:
         BmkMenu::BmkMenuType m_nType;
-        USHORT			CreateMenuId();
+        USHORT CreateMenuId();
 
     private:
-                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, 
-                                 BmkMenuType, BmkMenu* pRoot );
+        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                 BmkMenuType, BmkMenu* pRoot
+        );
 
         BmkMenu_Impl*	_pImp;
 };
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 5929b8b348..cc85041b41 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,19 +69,19 @@
 #define RID_IMAGE_STATUSBAR_LOGO                (RID_IMAGE_START+0)
 
 // License Dialog
-#define DLG_LICENSE                         (RID_FWK_DIALOG_START+256)
-#define ML_LICENSE                          (RID_FWK_DIALOG_START+11)
-#define FT_INFO1                            (RID_FWK_DIALOG_START+12)
-#define FT_INFO2                            (RID_FWK_DIALOG_START+13)
-#define FT_INFO3                            (RID_FWK_DIALOG_START+14)
-#define FT_INFO2_1                          (RID_FWK_DIALOG_START+15)
-#define FT_INFO3_1                          (RID_FWK_DIALOG_START+16)
-#define FL_DIVIDE                           (RID_FWK_DIALOG_START+17)
-#define PB_PAGEDOWN                         (RID_FWK_DIALOG_START+18)
-#define IMG_ARROW                           (RID_FWK_DIALOG_START+19)
-#define LICENSE_ACCEPT                      (RID_FWK_DIALOG_START+20)
-#define LICENSE_NOTACCEPT                   (RID_FWK_DIALOG_START+21)
-#define PB_DECLINE                          (RID_FWK_DIALOG_START+22)
-#define PB_ACCEPT                           (RID_FWK_DIALOG_START+23)
+#define DLG_LICENSE                             (RID_FWK_DIALOG_START+256)
+#define ML_LICENSE                              (RID_FWK_DIALOG_START+11)
+#define FT_INFO1                                (RID_FWK_DIALOG_START+12)
+#define FT_INFO2                                (RID_FWK_DIALOG_START+13)
+#define FT_INFO3                                (RID_FWK_DIALOG_START+14)
+#define FT_INFO2_1                              (RID_FWK_DIALOG_START+15)
+#define FT_INFO3_1                              (RID_FWK_DIALOG_START+16)
+#define FL_DIVIDE                               (RID_FWK_DIALOG_START+17)
+#define PB_PAGEDOWN                             (RID_FWK_DIALOG_START+18)
+#define IMG_ARROW                               (RID_FWK_DIALOG_START+19)
+#define LICENSE_ACCEPT                          (RID_FWK_DIALOG_START+20)
+#define LICENSE_NOTACCEPT                       (RID_FWK_DIALOG_START+21)
+#define PB_DECLINE                              (RID_FWK_DIALOG_START+22)
+#define PB_ACCEPT                               (RID_FWK_DIALOG_START+23)
 
 #endif
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 86ad3f7470..396dbe51ae 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,19 +30,19 @@
 
 #include "svl/solar.hrc"
 
-#define RID_FWK_START				260
+#define RID_FWK_START                       260
 
-#define RID_GROUPS_OFFSET           32000
-#define RID_GROUPS_END              32767
+#define RID_GROUPS_OFFSET                   32000
+#define RID_GROUPS_END                      32767
 
 #define RID_FWK_DIALOG_START_CORRECT        (RID_FWK_START + 2048)
 
-#define	DLG_FILTER_SELECT			(RID_FWK_DIALOG_START_CORRECT + 0)
+#define	DLG_FILTER_SELECT                   (RID_FWK_DIALOG_START_CORRECT + 0)
 
-#define	STR_FILTER_DOWNLOAD			(RID_FWK_START+0)
-#define STR_FILTER_CHOOSER			(RID_FWK_START+1)
-#define STR_FILTER_OTHERS			(RID_FWK_START+2)
-#define STR_FILTER_ZIPPED			(RID_FWK_START+3)
+#define	STR_FILTER_DOWNLOAD                 (RID_FWK_START+0)
+#define STR_FILTER_CHOOSER                  (RID_FWK_START+1)
+#define STR_FILTER_OTHERS                   (RID_FWK_START+2)
+#define STR_FILTER_ZIPPED                   (RID_FWK_START+3)
 
 // ResIds for BackingWindow
 #define DLG_BACKING                         (RID_FWK_DIALOG_START_CORRECT+100)
@@ -57,13 +57,7 @@
 #define STR_BACKING_TPLREP                  9
 
 #define RES_BACKING_IMAGES                  (DLG_BACKING+1)
-#define RES_BACKING_IMAGES_HC               (DLG_BACKING+2)
 
-#define BMP_BACKING_BACKGROUND_LEFT         1
-#define BMP_BACKING_BACKGROUND_MIDDLE       2
-#define BMP_BACKING_BACKGROUND_RIGHT        3
-#define BMP_BACKING_BACKGROUND_RTL_LEFT     4
-#define BMP_BACKING_BACKGROUND_RTL_RIGHT    5
 #define BMP_BACKING_EXT                     6
 #define BMP_BACKING_REG                     7
 #define BMP_BACKING_INFO                    8
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 4bf4fc6138..573448cce4 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,11 +40,21 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig,
+    BOOL bHiContrast
+);
 
 pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig,
+    BOOL bHiContrast
+);
 
 }
 
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index 15ba895ef2..8513f6057f 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -366,15 +366,15 @@ class AddonsOptions_Impl : public ConfigItem
         ImageEntry*	ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName );
 
         sal_Int32                                         m_nRootAddonPopupMenuId;
-        ::rtl::OUString                                          m_aPropNames[PROPERTYCOUNT_INDEX];
-        ::rtl::OUString                                          m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
-        ::rtl::OUString                                          m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
-        ::rtl::OUString                                          m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
-        ::rtl::OUString                                          m_aEmpty;
-        ::rtl::OUString                                          m_aPathDelimiter;
-        ::rtl::OUString                                          m_aSeparator;
-        ::rtl::OUString                                          m_aRootAddonPopupMenuURLPrexfix;
-        ::rtl::OUString                                          m_aPrivateImageURL;
+        ::rtl::OUString                                   m_aPropNames[PROPERTYCOUNT_INDEX];
+        ::rtl::OUString                                   m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
+        ::rtl::OUString                                   m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
+        ::rtl::OUString                                   m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
+        ::rtl::OUString                                   m_aEmpty;
+        ::rtl::OUString                                   m_aPathDelimiter;
+        ::rtl::OUString                                   m_aSeparator;
+        ::rtl::OUString                                   m_aRootAddonPopupMenuURLPrexfix;
+        ::rtl::OUString                                   m_aPrivateImageURL;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuProperties;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuBarPartProperties;
         AddonToolBars                                     m_aCachedToolBarPartProperties;
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 902566e9df..1041bf7f6b 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -258,7 +258,7 @@ MenuManager::MenuManager(
                 // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
                 AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
 
-                
+
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
                     Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 60ce86ef82..7a9749f1a4 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -131,8 +131,6 @@ String STR_STATUSBAR_LOGOTEXT
 //       License Dialog
 // ***********************************************************************
 #define LICENSE_DIALOG_WIDTH  260
-//#define LICENSE_DIALOG_HEIGTH 185
-//#define LICENSE_DIALOG_HEIGTH 190
 #define LICENSE_RIGHT_BORDER  7
 #define LICENSE_BOTTOM_BORDER  0
 #define LICENSE_ROW_1 (7)
@@ -293,7 +291,7 @@ String STR_FULL_DISC_MSG
 
 String STR_RESTORE_TOOLBARS
 {
-    Text [ en-US ] = "~Reset" ;    
+    Text [ en-US ] = "~Reset" ;
 };
 
 String STR_CORRUPT_UICFG_SHARE
@@ -322,33 +320,39 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES
     Text [ en-US ] = "Multiple Languages" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_NONE
 {
-    Text [ en-US ] = "None (Do not check spelling)" ; 
-    Text [ x-comment ] = " ";   
+    Text [ en-US ] = "None (Do not check spelling)" ;
+    Text [ x-comment ] = " ";
 };
+
 String STR_RESET_TO_DEFAULT_LANGUAGE
 {
-    Text [ en-US ] = "Reset to Default Language" ; 
-    Text [ x-comment ] = " ";   
+    Text [ en-US ] = "Reset to Default Language" ;
+    Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_MORE
 {
-    Text [ en-US ] = "More..." ;   
-    Text [ x-comment ] = " "; 
+    Text [ en-US ] = "More..." ;
+    Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_SELECTION
 {
-    Text [ en-US ] = "Set Language for Selection" ;   
-    Text [ x-comment ] = " "; 
+    Text [ en-US ] = "Set Language for Selection" ;
+    Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_PARAGRAPH
 {
-    Text [ en-US ] = "Set Language for Paragraph" ;   
-    Text [ x-comment ] = " "; 
+    Text [ en-US ] = "Set Language for Paragraph" ;
+    Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_ALL_TEXT
 {
-    Text [ en-US ] = "Set Language for all Text" ;   
-    Text [ x-comment ] = " "; 
+    Text [ en-US ] = "Set Language for all Text" ;
+    Text [ x-comment ] = " ";
 };
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index c29a771fe2..5a2750b23f 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,12 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig,
+    BOOL bHiContrast
+)
 {
     if ( _pGetImageFunc )
         return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index fa806f89d9..6d83baf2d6 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -245,7 +245,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     // add some breathing space for the images
     maButtonImageSize.Width() += 12;
     maButtonImageSize.Height() += 12;
-    
+
 }
 
 
@@ -286,12 +286,12 @@ void BackingWindow::prepareRecentFileMenu()
         mpRecentMenu = new PopupMenu();
     mpRecentMenu->Clear();
     maRecentFiles.clear();
-    
+
     // get recent file list and dispatch arguments
     Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
 
     sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
-        
+
     if( ( nPickListMenuItems > 0 ) )
     {
         maRecentFiles.reserve( nPickListMenuItems );
@@ -299,11 +299,11 @@ void BackingWindow::prepareRecentFileMenu()
         {
             Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
             rtl::OUString aURL, aFilter, aFilterOpt, aTitle;
-            
+
             for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ )
             {
                 const Any& a = rPickListEntry[j].Value;
-                
+
                 if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
                     a >>= aURL;
                 else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER )
@@ -330,7 +330,7 @@ void BackingWindow::prepareRecentFileMenu()
             nArgs--;
             rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
             rArgsList[nArgs].Value = makeAny( aFilter );
-            
+
             if( aFilterOpt.getLength() )
             {
                 nArgs--;
@@ -346,20 +346,20 @@ void BackingWindow::prepareRecentFileMenu()
             nArgs--;
             rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
             rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
-            
+
             // and finally create an entry in the popupmenu
             rtl::OUString	aMenuTitle;
             INetURLObject	aURLObj( aURL );
-            
+
             if ( aURLObj.GetProtocol() == INET_PROT_FILE )
             {
                 // Do handle file URL differently => convert it to a system
                 // path and abbreviate it with a special function:
                 String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
-                
+
                 rtl::OUString	aSystemPath( aFileSystemPath );
                 rtl::OUString	aCompactedSystemPath;
-                
+
                 oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
                 if ( !nError )
                     aMenuTitle = String( aCompactedSystemPath );
@@ -404,13 +404,13 @@ void BackingWindow::initBackground()
         maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE );
     else if( mnLayoutStyle == 1 )
         maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK );
-    else 
+    else
         maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 );
-    
+
     Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
 
     // select image set
-    ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) );
+    ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) );
 
     // scale middle segment
     Size aMiddleSize;
@@ -461,7 +461,7 @@ void BackingWindow::initBackground()
     loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
     loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
     loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
-    
+
     maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
     maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
     maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
@@ -524,7 +524,7 @@ void BackingWindow::initControls()
 
     if( mnLayoutStyle == 1 )
     {
-        maWelcome.Show();        
+        maWelcome.Show();
         maProduct.Show();
     }
 
@@ -595,19 +595,19 @@ void BackingWindow::initControls()
                   maMathButton, aMnemns );
 
     nYPos += 3*maButtonImageSize.Height() / 2;
-    
+
     layoutButton( NULL, 0, aFileNewAppsAvailable,
                   aModuleOptions, SvtModuleOptions::E_SWRITER,
                   maOpenButton, aMnemns, maOpenString );
     layoutButton( NULL, 1, aFileNewAppsAvailable,
                   aModuleOptions, SvtModuleOptions::E_SWRITER,
-                  maTemplateButton, aMnemns, maTemplateString );    
+                  maTemplateButton, aMnemns, maTemplateString );
     nYPos += 10;
 
     DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
     if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() )
         maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20;
-    
+
     mnTextColumnWidth[0] = mnColumnWidth[0];
     mnTextColumnWidth[1] = mnColumnWidth[1];
 
@@ -649,7 +649,7 @@ void BackingWindow::initControls()
         maBackgroundMiddle = BitmapEx();
 
     Resize();
-    
+
     maWriterButton.GrabFocus();
 }
 
@@ -688,7 +688,7 @@ void BackingWindow::layoutButton(
     String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
     i_rMnemns.CreateMnemonic( aText );
     i_rBtn.SetText( aText );
-    
+
     long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
     nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
@@ -811,7 +811,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt )
                 else if( maDBButton.HasFocus() )
                     maMathButton.GrabFocus();
                 else if( maMathButton.HasFocus() )
-                    maTemplateButton.GrabFocus();                
+                    maTemplateButton.GrabFocus();
                 return 1;
             }
         }
@@ -873,7 +873,7 @@ void BackingWindow::Resize()
     nYPos += nPDelta - nDiff;
 
     nYPos += nWDelta/2 - nDiff;
-    
+
     if( mnLayoutStyle != 1 )
         nYPos = maControlRect.Top() + mnBtnTop;
 
@@ -952,7 +952,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
                     rtl::OUString sURL;
                     //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
                     Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) );
-                    sURL = value.get<rtl::OUString> ();                    
+                    sURL = value.get<rtl::OUString> ();
                     localizeWebserviceURI(sURL);
 
                     Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index 15d735d88d..d2368f9eac 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -123,78 +123,6 @@ Resource RES_BACKING_IMAGES
     };
 };
 
-Resource RES_BACKING_IMAGES_HC
-{
-    Bitmap BMP_BACKING_BACKGROUND_LEFT
-    {
-        File = "backing_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-    {
-        File = "backing_space_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RIGHT
-    {
-        File = "backing_right_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-    {
-        File = "backing_rtl_left_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-    {
-        File = "backing_rtl_right_hc.png";
-    };
-    Bitmap BMP_BACKING_EXT
-    {
-        File = "extension_hc.png";
-    };
-    Bitmap BMP_BACKING_REG
-    {
-        File = "register_hc.png";
-    };
-    Bitmap BMP_BACKING_INFO
-    {
-        File = "info_hc.png";
-    };
-    Bitmap BMP_BACKING_TPLREP
-    {
-        File = "template_hc.png";
-    };
-    Bitmap BMP_BACKING_WRITER
-    {
-        File = "odt_32_hc.png";
-    };
-    Bitmap BMP_BACKING_CALC
-    {
-        File = "ods_32_hc.png";
-    };
-    Bitmap BMP_BACKING_IMPRESS
-    {
-        File = "odp_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DRAW
-    {
-        File = "odg_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DATABASE
-    {
-        File = "odb_32_hc.png";
-    };
-    Bitmap BMP_BACKING_FORMULA
-    {
-        File = "odf_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENFILE
-    {
-        File = "folder_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENTEMPLATE
-    {
-        File = "templates_32_hc.png";
-    };
-};
-
 Window WIN_TABWINDOW
 {
     OutputSize = TRUE ;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index c5c1275648..f6d21573d1 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,7 +69,6 @@
 // Function-Id's
 #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
 #define RID_SVXIMGLIST_FMEXPL	   (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC   (RID_FORMS_START + 2)
 
 // Forms - Ids, used to address images from image list
 #define SID_FMSLOTS_START					(SID_SVX_START + 592)
@@ -194,7 +193,7 @@ const char* aCommands[] =
 //_________________________________________________________________________________________________________________
 //	Defines
 //_________________________________________________________________________________________________________________
-// 
+//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -233,11 +232,11 @@ ControlMenuController::~ControlMenuController()
 void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
 {
     rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" ));
-    
+
     ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
-    ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr );
+    ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
     aResId.SetRT( RSC_IMAGELIST );
-    
+
     if ( pResMgr->IsAvailable( aResId ))
     {
         ImageList aImageList( aResId );
@@ -259,13 +258,13 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
 {
     VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*                                         pVCLPopupMenu     = 0;
-    
+
     SolarMutexGuard aSolarMutexGuard;
-    
+
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
         pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-        
+
     if ( pVCLPopupMenu && m_pResPopupMenu )
         *pVCLPopupMenu = *m_pResPopupMenu;
 }
@@ -279,7 +278,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
-    
+
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
     m_xPopupMenu.clear();
@@ -290,8 +289,8 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
-        
-    USHORT nMenuId = 0;    
+
+    USHORT nMenuId = 0;
     for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
     {
         if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] ))
@@ -304,9 +303,9 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
     if ( nMenuId )
     {
         VCLXPopupMenu*  pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
-    
+
         SolarMutexGuard aSolarMutexGuard;
-    
+
         PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
 
         if ( !Event.IsEnabled && pVCLPopupMenu->GetItemPos( nMenuId ) != MENU_ITEM_NOTFOUND )
@@ -325,11 +324,11 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
                 if ( nPrevInConversion != MENU_ITEM_NOTFOUND )
                     break;
             }
-            
+
           if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
                 // none of the items which precede the nSID-slot in the source menu are present in our conversion menu
                 nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1);	// put the item at the first position
-            
+
             pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion );
             pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId ));
             pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId ));
@@ -355,11 +354,11 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
 void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
-    
+
     if ( m_xPopupMenu.is() )
     {
         SolarMutexGuard aSolarMutexGuard;
-        
+
         // Check if some modes have changed so we have to update our menu images
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         sal_Bool bIsHiContrast      = rSettings.GetHighContrastMode();
@@ -404,25 +403,25 @@ void ControlMenuController::impl_setPopupMenu()
         }
     } // if ( m_pResPopupMenu == 0 )
 }
-        
+
 void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
     throwIfDisposed();
-    
+
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
         URL aTargetURL;
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         fillPopupMenu( m_xPopupMenu );
         m_aURLToDispatchMap.free();
-        
+
         for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
         {
             aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
             m_xURLTransformer->parseStrict( aTargetURL );
-            
+
             Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
             if ( xDispatch.is() )
             {
@@ -439,7 +438,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     svt::PopupMenuControllerBase::initialize(aArguments);
-    m_aBaseURL = ::rtl::OUString();    
+    m_aBaseURL = ::rtl::OUString();
 }
 
 }
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 1c272977b8..6f0e5c4a3c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1809,7 +1809,7 @@ void MenuBarManager::FillMenu(
                         if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK )
                            nBits |= MIB_RADIOCHECK;
                         pMenu->SetItemBits( nId, nBits );
-                    } 
+                    }
                     if ( xIndexContainer.is() )
                     {
                         PopupMenu* pNewPopupMenu = new PopupMenu;