High-Contrast Cleanup Phase #1

6 files changed, 23 insertions, 87 deletions

diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index ccfbbfbffca1..1ebb6588974a 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -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/resource.src b/framework/source/classes/resource.src
index 1cd9ecc6dd30..3f354d438879 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -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)
@@ -322,31 +320,37 @@ 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 ] = " ";
 };
+
 String STR_RESET_TO_DEFAULT_LANGUAGE
 {
     Text [ en-US ] = "Reset to Default Language" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_MORE
 {
     Text [ en-US ] = "More..." ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_SELECTION
 {
     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 ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_ALL_TEXT
 {
     Text [ en-US ] = "Set Language for all Text" ;
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index 2630fab87373..e404be304d99 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -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 a7d7741bbc04..94d9dfae0c1e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -410,7 +410,7 @@ void BackingWindow::initBackground()
     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;
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index bdbe81bc7fb3..d2368f9eacdc 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -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 7cf66b62405a..7b02594e8e61 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -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)
@@ -235,7 +234,7 @@ 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 ))