HC Cleanup - components

17 files changed, 89 insertions, 111 deletions

diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 2460ec23d4c7..ccc583d62037 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -26,44 +26,43 @@
  ************************************************************************/
 
 #define GRP_FUNCTIONS 22
-#define BTN_ACC_OK 1
-#define BTN_ACC_CANCEL 2
-#define BTN_ACC_CHANGE 3
-#define BTN_ACC_REMOVE 4
-#define BOX_ACC_ENTRIES 5
-#define TXT_ACC_DESCRIPTIONTEXT 6
-#define TXT_ACC_DESCRIPTIONINFO 7
-#define GRP_ACC_KEYBOARD 8
-#define TXT_ACC_GROUP 9
-#define BOX_ACC_GROUP 10
-#define TXT_ACC_FUNCTION 11
-#define BOX_ACC_FUNCTION 12
-#define TXT_ACC_KEY 13
-#define BOX_ACC_KEY 14
-#define GRP_ACC_FUNCTIONS 15
-#define BTN_RESET   20
-#define BTN_LOAD 40
-#define BTN_SAVE 41
-#define RB_OFFICE 44
-#define RB_MODULE 45
-#define STR_LOADACCELCONFIG 46
-#define STR_SAVEACCELCONFIG 47
-
-#define IMG_HARDDISK 48
-#define STR_PRODMACROS 50
-#define STR_MYMACROS 51
-#define IMG_LIB       52
-#define IMG_MACRO         54
-#define IMG_DOC          56
-#define STR_GROUP_STYLES    58
-#define STR_PDF_EXPORT_SEND   59
-#define STR_RECHECK_DOCUMENT  60
-#define IMG_INFO            61
-#define STR_BASICNAME 62
-#define BMP_COLLAPSED 63
-#define BMP_EXPANDED 64
-#define STR_BASICMACROS 67
-#define STR_DLG_MACROS 68
-#define STR_HUMAN_APPNAME 69
-#define STR_FILTERNAME_CFG 70
+#define BTN_ACC_OK               1
+#define BTN_ACC_CANCEL           2
+#define BTN_ACC_CHANGE           3
+#define BTN_ACC_REMOVE           4
+#define BOX_ACC_ENTRIES          5
+#define TXT_ACC_DESCRIPTIONTEXT  6
+#define TXT_ACC_DESCRIPTIONINFO  7
+#define GRP_ACC_KEYBOARD         8
+#define TXT_ACC_GROUP            9
+#define BOX_ACC_GROUP           10
+#define TXT_ACC_FUNCTION        11
+#define BOX_ACC_FUNCTION        12
+#define TXT_ACC_KEY             13
+#define BOX_ACC_KEY             14
+#define GRP_ACC_FUNCTIONS       15
+#define BTN_RESET               20
+#define BTN_LOAD                40
+#define BTN_SAVE                41
+#define RB_OFFICE               44
+#define RB_MODULE               45
+#define STR_LOADACCELCONFIG     46
+#define STR_SAVEACCELCONFIG     47
 
+#define IMG_HARDDISK            48
+#define STR_PRODMACROS          50
+#define STR_MYMACROS            51
+#define IMG_LIB                 52
+#define IMG_MACRO               54
+#define IMG_DOC                 56
+#define STR_GROUP_STYLES        58
+#define STR_PDF_EXPORT_SEND     59
+#define STR_RECHECK_DOCUMENT    60
+#define IMG_INFO                61
+#define STR_BASICNAME           62
+#define BMP_COLLAPSED           63
+#define BMP_EXPANDED            64
+#define STR_BASICMACROS         67
+#define STR_DLG_MACROS          68
+#define STR_HUMAN_APPNAME       69
+#define STR_FILTERNAME_CFG      70
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 7ffa643907af..7d6e89b4bff5 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -902,9 +902,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                             }
                             if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
                             {
-
-//                                  We call acquire on the XBrowseNode so that it does not
-//                                  get autodestructed and become invalid when accessed later.
+//                              We call acquire on the XBrowseNode so that it does not
+//                              get autodestructed and become invalid when accessed later.
                                 theChild->acquire();
 
                                 SfxGroupInfo_Impl* pInfo =
@@ -959,7 +958,11 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
     MakeVisible( GetEntry( 0,0 ) );
     SetUpdateMode( TRUE );
 }
-Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
+Image SfxConfigGroupListBox_Impl::GetImage(
+    Reference< browse::XBrowseNode > node,
+    Reference< XComponentContext > xCtx,
+    bool bIsRootNode
+)
 {
     Image aImage;
     if ( bIsRootNode )
@@ -1013,8 +1016,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
             }
             if( factoryURL.getLength() > 0 )
             {
-                aImage = SvFileInformationManager::GetFileImage(
-                    INetURLObject(factoryURL), false );
+                aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
             }
             else
             {
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 28e21b7700b8..4954c4685c43 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -617,7 +617,11 @@ void SvxConfigGroupListBox_Impl::Init()
     SetUpdateMode( TRUE );
 }
 
-Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
+Image SvxConfigGroupListBox_Impl::GetImage(
+    Reference< browse::XBrowseNode > node,
+    Reference< XComponentContext > xCtx,
+    bool bIsRootNode
+)
 {
     Image aImage;
     if ( bIsRootNode )
@@ -666,8 +670,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
             }
             if( factoryURL.getLength() > 0 )
             {
-                aImage = SvFileInformationManager::GetFileImage(
-                    INetURLObject(factoryURL), false);
+                aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
             }
             else
             {
diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc
index 388871f332e7..a8dee0cc128a 100644
--- a/cui/source/customize/selector.hrc
+++ b/cui/source/customize/selector.hrc
@@ -35,6 +35,7 @@
 #define BTN_SELECTOR_HELP 8
 #define GRP_SELECTOR_DESCRIPTION 9
 #define TXT_SELECTOR_DESCRIPTION 10
+
 #define IMG_HARDDISK                   1
 #define IMG_LIB                        3
 #define IMG_MACRO                      5
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 2db6cf9d0eb0..55717e723a64 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -226,7 +226,6 @@ SpellDialog::SpellDialog(
     aBackgroundGB   ( this, CUI_RES( GB_BACKGROUND ) ),
 
     aVendorImage    ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorImageHC  ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
 
     aResumeST       ( CUI_RES(ST_RESUME )),
     aIgnoreOnceST   ( aIgnorePB.GetText()),
@@ -879,9 +878,8 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives();
         if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() )
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
             ::rtl::OUString sSuggestionImageUrl =
-                SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast );
+                SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName );
             aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) );
             uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY );
             if( xDisplayName.is() )
@@ -889,8 +887,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         }
         else
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-            aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage );
+            aVendorImageFI.SetImage( aVendorImage );
         }
 
         if( sVendor.Len() )
diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index 5c9a82ffef0e..d51ec1e82249 100644
--- a/cui/source/dialogs/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
@@ -51,5 +51,4 @@
 #define PB_EXPLAIN                  55
 #define IMG_VENDOR                  56
 #define IMG_DEFAULT_VENDOR          57
-#define IMG_DEFAULT_VENDOR_HC       58
 #define PB_IGNORERULE               59
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 4f8831637c7c..cc14ba6a9f4b 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -214,10 +214,5 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     {
         ImageBitmap = Bitmap { File = "vendor01.png"; };
     };
-    Image IMG_DEFAULT_VENDOR_HC
-    {
-        ImageBitmap = Bitmap { File = "vendor01h.png"; };
-    };
-
 };
  // ********************************************************************** EOF
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index f52674d6a432..03a1faa2383a 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -380,11 +380,15 @@ IconChoiceDialog ::~IconChoiceDialog ()
 |
 \**********************************************************************/
 
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
-                                   const Image& rChoiceIcon,
-                                   CreatePage pCreateFunc /* != 0 */,
-                                   GetPageRanges pRangesFunc /* darf 0 sein */,
-                                   BOOL bItemsOnDemand, ULONG /*nPos*/ )
+SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
+    USHORT          nId,
+    const String&   rIconText,
+    const Image&    rChoiceIcon,
+    CreatePage      pCreateFunc /* != 0 */,
+    GetPageRanges   pRangesFunc /* darf 0 sein */,
+    BOOL            bItemsOnDemand,
+    ULONG           /*nPos*/
+)
 {
     IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
                                                          pRangesFunc,
@@ -400,27 +404,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
     return pEntry;
 }
 
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
-                                   const Image& rChoiceIcon,
-                                   const Image& rChoiceIconHC,
-                                   CreatePage pCreateFunc /* != 0 */,
-                                   GetPageRanges pRangesFunc /* darf 0 sein */,
-                                   BOOL bItemsOnDemand, ULONG /*nPos*/ )
-{
-    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
-                                                         pRangesFunc,
-                                                         bItemsOnDemand );
-    maPageList.Insert ( pData, LIST_APPEND );
-
-    pData->fnGetRanges = pRangesFunc;
-    pData->bOnDemand = bItemsOnDemand;
-
-    USHORT *pId = new USHORT ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
-    pEntry->SetUserData ( (void*) pId );
-    return pEntry;
-}
-
 /**********************************************************************
 |
 | remove page
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 047d27a2ca90..6aa067682b00 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -387,8 +387,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
     SvLBoxEntry * p;
     if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 )
     {
-        Image aImage = SvFileInformationManager::GetFileImage(
-            INetURLObject(factoryURL), false );
+        Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
         p = InsertEntry(
             rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
             aUserData.release()); // XXX possible leak
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index a61d394d23bc..05ab43d412fa 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -307,7 +307,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
     aCancelBtn      ( pDialog, CUI_RES( BTN_THES_CANCEL ) ),
     aErrStr                 ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ),
     aVendorDefaultImage     ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorDefaultImageHC   ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
     xThesaurus      ( NULL ),
     aLookUpText     (),
     nLookUpLanguage ( LANGUAGE_NONE ),
@@ -567,15 +566,13 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage()
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
-        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-
         Image aImage;
         String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) );
-        OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName, bHC ) );
+        OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) );
         if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0)
             aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) );
         else
-            aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage;
+            aImage = aVendorDefaultImage;
         aVendorImageFI.SetImage( aImage );
     }
 
@@ -589,8 +586,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
-        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-        Image aImage( bHC ? pThis->aVendorDefaultImageHC : pThis->aVendorDefaultImage );
+        Image aImage( pThis->aVendorDefaultImage );
         pThis->aVendorImageFI.SetImage( aImage );
         pThis->aVendorImageFI.Show();
 
diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc
index ad5cc4af8cc5..aef4131db3e6 100755
--- a/cui/source/dialogs/thesdlg.hrc
+++ b/cui/source/dialogs/thesdlg.hrc
@@ -43,7 +43,6 @@
 #define CT_THES_ALTERNATIVES    25
 #define IMG_VENDOR              26
 #define IMG_DEFAULT_VENDOR      27
-#define IMG_DEFAULT_VENDOR_HC   28
 
 #define STR_ERR_TEXTNOTFOUND    101
 
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 6c6a6444b33d..ca0f69c4ef2a 100755
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -138,9 +138,5 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         ImageBitmap = Bitmap { File = "vendor01.png"; };
     };
-    Image IMG_DEFAULT_VENDOR_HC
-    {
-        ImageBitmap = Bitmap { File = "vendor01h.png"; };
-    };
 };
 
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index d72b8625e3ea..b2d11087f3d6 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -191,7 +191,6 @@ struct SvxThesaurusDialog_Impl
 
     String          aErrStr;
     Image           aVendorDefaultImage;
-    Image           aVendorDefaultImageHC;
 
     uno::Reference< linguistic2::XThesaurus >   xThesaurus;
     OUString                aLookUpText;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 498749cbe4d9..45cb973d3249 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -184,7 +184,6 @@ private:
     GroupBox        aBackgroundGB;
 
     Image           aVendorImage;
-    Image           aVendorImageHC;
 
     String          aResumeST;
     String          aIgnoreOnceST;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 6fb87b38d1d3..dbab5bf29df7 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -170,9 +170,17 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
     css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
 
-    Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
+    Image GetImage(
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+        bool bIsRootNode
+    );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel(
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+        ::rtl::OUString& docName
+    );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
     ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
 
     void InitModule();
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 38725c02ecb7..a81f4970212e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -245,11 +245,6 @@ public :
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
 
-    SvxIconChoiceCtrlEntry* AddTabPage(
-        USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
-        CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
     void                RemoveTabPage( USHORT nId );
 
     void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 541b3f0db5e4..7ca6dbeb3054 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -155,8 +155,16 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox
     Image m_docImage;
     ::rtl::OUString m_sMyMacros;
     ::rtl::OUString m_sProdMacros;
-    Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
+    Image GetImage(
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+        bool bIsRootNode
+    );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel(
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+        ::rtl::OUString& docName
+    );
 
 private:
     void    fillScriptList(