High-Contrast Cleanup Phase #1

6 files changed, 80 insertions, 115 deletions

diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 19b2faf129..77b3fa0096 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.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
@@ -35,7 +35,7 @@
 #define RID_DLG_EXTENSION_MANAGER              RID_DEPLOYMENT_GUI_START
 #define RID_DLG_UPDATE_REQUIRED               (RID_DEPLOYMENT_GUI_START + 11)
 
-#define RID_EM_BTN_CLOSE                       10                      
+#define RID_EM_BTN_CLOSE                       10
 #define RID_EM_BTN_HELP                        11
 #define RID_EM_BTN_ADD                         12
 #define RID_EM_BTN_CHECK_UPDATES               13
@@ -57,7 +57,6 @@
 #define FL_LICENSE								69
 #define FI_LICENSE_ARROW1						60
 #define FI_LICENSE_ARROW2						61
-#define IMG_LICENCE_ARROW_HC					62
 #define BTN_LICENSE_ACCEPT						63
 
 // local RIDs for "Download and Install" dialog
@@ -94,28 +93,28 @@
 #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
 #define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10)
-
-#define RID_DLG_UPDATE_CHECKING 1
-#define RID_DLG_UPDATE_THROBBER 2
-#define RID_DLG_UPDATE_UPDATE 3
-#define RID_DLG_UPDATE_UPDATES 4
-#define RID_DLG_UPDATE_ALL 5
-#define RID_DLG_UPDATE_DESCRIPTION 6
-#define RID_DLG_UPDATE_DESCRIPTIONS 7
-#define RID_DLG_UPDATE_LINE 8
-#define RID_DLG_UPDATE_HELP 9
-#define RID_DLG_UPDATE_OK 10
-#define RID_DLG_UPDATE_CANCEL 11
-#define RID_DLG_UPDATE_NORMALALERT 12
-#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13
-#define RID_DLG_UPDATE_ERROR 14
-#define RID_DLG_UPDATE_NONE 15
-#define RID_DLG_UPDATE_NOINSTALLABLE 16
-#define RID_DLG_UPDATE_FAILURE 17
-#define RID_DLG_UPDATE_UNKNOWNERROR 18
-#define RID_DLG_UPDATE_NODESCRIPTION 19
-#define RID_DLG_UPDATE_NOINSTALL 20
+#define RID_DLG_UPDATE                      (RID_DEPLOYMENT_GUI_START + 10)
+
+#define RID_DLG_UPDATE_CHECKING             1
+#define RID_DLG_UPDATE_THROBBER             2
+#define RID_DLG_UPDATE_UPDATE               3
+#define RID_DLG_UPDATE_UPDATES              4
+#define RID_DLG_UPDATE_ALL                  5
+#define RID_DLG_UPDATE_DESCRIPTION          6
+#define RID_DLG_UPDATE_DESCRIPTIONS         7
+#define RID_DLG_UPDATE_LINE                 8
+#define RID_DLG_UPDATE_HELP                 9
+#define RID_DLG_UPDATE_OK                   10
+#define RID_DLG_UPDATE_CANCEL               11
+#define RID_DLG_UPDATE_NORMALALERT          12
+#define RID_DLG_UPDATE_HIGHCONTRASTALERT    13
+#define RID_DLG_UPDATE_ERROR                14
+#define RID_DLG_UPDATE_NONE                 15
+#define RID_DLG_UPDATE_NOINSTALLABLE        16
+#define RID_DLG_UPDATE_FAILURE              17
+#define RID_DLG_UPDATE_UNKNOWNERROR         18
+#define RID_DLG_UPDATE_NODESCRIPTION        19
+#define RID_DLG_UPDATE_NOINSTALL            20
 #define RID_DLG_UPDATE_NODEPENDENCY         21
 #define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22
 #define RID_DLG_UPDATE_NOPERMISSION         23
@@ -123,8 +122,8 @@
 #define RID_DLG_UPDATE_BROWSERBASED         25
 #define RID_DLG_UPDATE_PUBLISHER_LABEL      26
 #define RID_DLG_UPDATE_PUBLISHER_LINK       27
-#define RID_DLG_UPDATE_RELEASENOTES_LABEL   28 
-#define RID_DLG_UPDATE_RELEASENOTES_LINK    29 
+#define RID_DLG_UPDATE_RELEASENOTES_LABEL   28
+#define RID_DLG_UPDATE_RELEASENOTES_LINK    29
 #define RID_DLG_UPDATE_NOUPDATE             30
 #define RID_DLG_UPDATE_VERSION              31
 
@@ -133,13 +132,9 @@
 #define RID_INFOBOX_UPDATE_SHARED_EXTENSION    (RID_DEPLOYMENT_GUI_START + 21)
 
 #define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
-#define RID_IMG_WARNING_HC                     (RID_DEPLOYMENT_GUI_START+57)
 #define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
-#define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
 #define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
-#define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
 #define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
-#define RID_IMG_SHARED_HC                      (RID_DEPLOYMENT_GUI_START+63)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index db2e09769d..cb9454fba6 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.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
@@ -31,27 +31,33 @@ String RID_STR_ADD_PACKAGES
 {
     Text [ en-US ] = "Add Extension(s)";
 };
+
 String RID_CTX_ITEM_REMOVE
 {
     Text [ en-US ] = "~Remove";
 };
+
 String RID_CTX_ITEM_ENABLE
 {
     Text [ en-US ] = "~Enable";
 };
+
 String RID_CTX_ITEM_DISABLE
 {
     Text [ en-US ] = "~Disable";
 };
+
 String RID_CTX_ITEM_CHECK_UPDATE
 {
     Text [ en-US ] = "~Update...";
 };
+
 String RID_CTX_ITEM_OPTIONS
 {
     Text [ en-US ] = "~Options...";
 };
 
+
 String RID_STR_ADDING_PACKAGES
 {
     Text [ en-US ] = "Adding %EXTENSION_NAME";
@@ -123,7 +129,7 @@ String RID_STR_ERROR_MISSING_LICENSE
 // ---------------------------------------------------
 //	row 1 | multi line edit
 // ---------------------------------------------------
-//  row 2 | fixed text 
+//  row 2 | fixed text
 // ---------------------------------------------------
 //  row 3 | img   | fixed text   | fixed text | button
 // ----------------------------------------------------
@@ -131,7 +137,7 @@ String RID_STR_ERROR_MISSING_LICENSE
 // ---------------------------------------------------
 //  row 5 |fixed line
 // ---------------------------------------------------
-//  row 6 |       |       |button  | button 
+//  row 6 |       |       |button  | button
 // ---------------------------------------------------
 //        | col 1 | col 2 | col3   | col4      | col5
 
@@ -177,7 +183,6 @@ ModalDialog RID_DLG_LICENSE
     Moveable = TRUE;
     Closeable = TRUE;
     Sizeable = FALSE;
-//    Hide = TRUE;
 
     MultiLineEdit ML_LICENSE
     {
@@ -187,7 +192,7 @@ ModalDialog RID_DLG_LICENSE
         VScroll = TRUE;
         ReadOnly = TRUE;
     };
-    
+
     FixedText FT_LICENSE_HEADER
     {
         Pos = MAP_APPFONT(COL1_X, ROW2_Y);
@@ -195,14 +200,16 @@ ModalDialog RID_DLG_LICENSE
         WordBreak = TRUE;
         NoLabel = TRUE;
         Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:";
-    };    
+    };
+
     FixedText FT_LICENSE_BODY_1
     {
         Pos = MAP_APPFONT(COL2_X, ROW3_Y);
         Size = MAP_APPFONT( COL2_WIDTH, ROW3_HEIGHT );
         NoLabel = TRUE;
         Text [ en-US ] = "1.";
-    };    
+    };
+
     //spans col3 + col4
     FixedText FT_LICENSE_BODY_1_TXT
     {
@@ -211,14 +218,16 @@ ModalDialog RID_DLG_LICENSE
         WordBreak = TRUE;
         NoLabel = TRUE;
         Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text.";
-    };    
+    };
+
     FixedText FT_LICENSE_BODY_2
     {
         Pos = MAP_APPFONT(COL2_X, ROW4_Y);
         Size = MAP_APPFONT(COL2_WIDTH, ROW4_HEIGHT);
         NoLabel = TRUE;
         Text [ en-US ] = "2.";
-    };    
+    };
+
     FixedText FT_LICENSE_BODY_2_TXT
     {
         Pos = MAP_APPFONT(COL3_X, ROW4_Y);
@@ -226,22 +235,24 @@ ModalDialog RID_DLG_LICENSE
         WordBreak = TRUE;
         NoLabel = TRUE;
         Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button.";
-   
-    };    
+
+    };
+
     PushButton PB_LICENSE_DOWN
     {
         TabStop = TRUE ;
         Pos = MAP_APPFONT(COL5_X , ROW3_Y) ;
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ;
         Text [ en-US ] = "~Scroll Down";
-           
+
     };
+
     FixedLine FL_LICENSE
     {
         Pos = MAP_APPFONT ( 0, ROW5_Y) ;
         Size = MAP_APPFONT ( LIC_DLG_WIDTH, ROW5_HEIGHT ) ;
     };
-    
+
     FixedImage FI_LICENSE_ARROW1
     {
         Pos = MAP_APPFONT (COL1_X, ROW3_Y) ;
@@ -252,7 +263,7 @@ ModalDialog RID_DLG_LICENSE
             MASKCOLOR
         };
     };
-    
+
     FixedImage FI_LICENSE_ARROW2
     {
         Pos = MAP_APPFONT (COL1_X, ROW4_Y) ;
@@ -263,13 +274,7 @@ ModalDialog RID_DLG_LICENSE
             MASKCOLOR
         };
     };
-    
-    Image IMG_LICENCE_ARROW_HC
-    {
-        ImageBitmap = Bitmap { File = "sch06300.png"; };
-        MASKCOLOR
-    };
-    
+
     OKButton BTN_LICENSE_ACCEPT
     {
         Pos = MAP_APPFONT(COL4_X, ROW6_Y);
@@ -279,7 +284,7 @@ ModalDialog RID_DLG_LICENSE
         DefButton = TRUE;
         Text [ en-US ] = "Accept";
     };
-    
+
     CancelButton BTN_LICENSE_DECLINE
     {
         Pos = MAP_APPFONT(COL5_X, ROW6_Y);
@@ -287,7 +292,7 @@ ModalDialog RID_DLG_LICENSE
         Text [ en-US ] = "Decline" ;
         TabStop = TRUE;
     };
-    
+
 };
 
 
@@ -338,7 +343,7 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
     "Click \'Cancel\' to stop disabling the extension.";
 };
 
- 
+
 String RID_STR_UNSUPPORTED_PLATFORM
 {
     Text [ en-US ] = "The extension \'%Name\' does not work on this computer.";
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index b74a802ceb..5c5fc24608 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.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
@@ -158,41 +158,21 @@ Image RID_IMG_WARNING
     ImageBitmap = Bitmap { File = "caution_16.png"; };
 };
 
-Image RID_IMG_WARNING_HC
-{
-    ImageBitmap = Bitmap { File = "caution_16_h.png"; };
-};
-
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "lock_16.png"; };
 };
 
-Image RID_IMG_LOCKED_HC
-{
-    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
-};
-
 Image RID_IMG_SHARED
 {
     ImageBitmap = Bitmap { File = "shared_16.png"; };
 };
 
-Image RID_IMG_SHARED_HC
-{
-    ImageBitmap = Bitmap { File = "shared_16_h.png"; };
-};
-
 Image RID_IMG_EXTENSION
 {
     ImageBitmap = Bitmap { File = "extension_32.png"; };
 };
 
-Image RID_IMG_EXTENSION_HC
-{
-    ImageBitmap = Bitmap { File = "extension_32_h.png"; };
-};
-
 QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
 {
     Buttons = WB_YES_NO_CANCEL;
@@ -205,7 +185,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
 // ---------------------------------------------------
 //	row 1 | multi line edit
 // ---------------------------------------------------
-//  row 2 | fixed text 
+//  row 2 | fixed text
 // ---------------------------------------------------
 //  row 3 | img   | fixed text   | fixed text | button
 // ----------------------------------------------------
@@ -213,7 +193,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
 // ---------------------------------------------------
 //  row 5 |fixed line
 // ---------------------------------------------------
-//  row 6 |       |       |button  | button 
+//  row 6 |       |       |button  | button
 // ---------------------------------------------------
 //        | col 1 | col 2 | col3   | col4      | col5
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 76126061f3..36c7afe46e 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -79,7 +79,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
     beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
     m_sPublisher = aInfo.First;
     m_sPublisherURL = aInfo.Second;
-    
+
     // get the icons for the package if there are any
     uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
     if ( xGraphic.is() )
@@ -179,13 +179,9 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
     m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
-    m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ),
     m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
-    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
     m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
-    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),
     m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
-    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),
     m_pScrollBar( NULL ),
     m_pManager( pManager )
 {
@@ -329,7 +325,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex )
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
     checkIndex( nIndex );
-    selectEntry( nIndex );   
+    selectEntry( nIndex );
 }
 
 //------------------------------------------------------------------------------
@@ -377,7 +373,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
     if ( aText.getLength() )
         aText += OUSTR("\n");
     aText += m_vEntries[ nPos ]->m_sDescription;
-    
+
     Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,
                                    TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
     aTextHeight += aRect.GetHeight();
@@ -450,10 +446,10 @@ void ExtensionBox_Impl::DeleteRemoved()
 void ExtensionBox_Impl::selectEntry( const long nPos )
 {
     //ToDo whe should not use the guard at such a big scope here.
-    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be 
+    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be
     //modified in this function.
     //It would be probably best to always use a copy of m_vEntries
-    //and some other state variables from ExtensionBox_Impl for 
+    //and some other state variables from ExtensionBox_Impl for
     //the whole painting operation. See issue i86993
     ::osl::ClearableMutexGuard guard(m_entriesMutex);
 
@@ -526,7 +522,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     aPos += Point( TOP_OFFSET, TOP_OFFSET );
     Image aImage;
     if ( ! pEntry->m_aIcon )
-        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;
+        aImage = m_aDefaultImage;
     else
         aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
     Size aImageSize = aImage.GetSizePixel();
@@ -634,16 +630,16 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
         if ( pEntry->m_bLocked )
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aLockedImage );
         else
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aSharedImage );
     }
     if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps || pEntry->m_bMissingLic )
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );
-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aWarningImage );
     }
-    
+
     SetLineColor( Color( COL_LIGHTGRAY ) );
     DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
 }
@@ -1052,7 +1048,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage
                 long nPos = iIndex - m_vEntries.begin();
 
                 // Entries mustn't removed here, because they contain a hyperlink control
-                // which can only be deleted when the thread has the solar mutex. Therefor 
+                // which can only be deleted when the thread has the solar mutex. Therefor
                 // the entry will be moved into the m_vRemovedEntries list which will be
                 // cleared on the next paint event
                 m_vRemovedEntries.push_back( *iIndex );
@@ -1127,7 +1123,7 @@ void ExtensionBox_Impl::checkEntries()
     long nNewPos = -1;
     long nPos = 0;
     bool bNeedsUpdate = false;
-    
+
     ::osl::ClearableMutexGuard guard(m_entriesMutex);
     typedef std::vector< TEntry_Impl >::iterator ITER;
     ITER iIndex = m_vEntries.begin();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 4726a0c9e2..f0122aba71 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.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
@@ -137,22 +137,18 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     long            m_nExtraHeight;
     Size            m_aOutputSize;
     Image           m_aSharedImage;
-    Image           m_aSharedImageHC;
     Image           m_aLockedImage;
-    Image           m_aLockedImageHC;
     Image           m_aWarningImage;
-    Image           m_aWarningImageHC;
     Image           m_aDefaultImage;
-    Image           m_aDefaultImageHC;
     Link            m_aClickHdl;
-    
+
     ScrollBar      *m_pScrollBar;
 
     com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;
 
     TheExtensionManager      *m_pManager;
     //This mutex is used for synchronizing access to m_vEntries.
-    //Currently it is used to synchronize adding, removing entries and 
+    //Currently it is used to synchronize adding, removing entries and
     //functions like getItemName, getItemDescription, etc. to prevent
     //that m_vEntries is accessed at an invalid index.
     //ToDo: There are many more places where m_vEntries is read and which may
@@ -194,7 +190,7 @@ public:
 
     const Size      GetMinOutputSizePixel() const;
     void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
-    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } 
+    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
     long            GetEntryCount() { return (long) m_vEntries.size(); }
     Rectangle       GetEntryRect( const long nPos ) const;
     bool            HasActive() { return m_bHasActive; }
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9fd55d2938..32faa7123b 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.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
@@ -90,7 +90,7 @@ protected:
 };
 
 struct LicenseDialogImpl : public ModalDialog
-{   
+{
     cssu::Reference<cssu::XComponentContext> m_xComponentContext;
     FixedText m_ftHead;
     FixedText m_ftBody1;
@@ -102,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog
     LicenseView m_mlLicense;
     PushButton m_pbDown;
     FixedLine m_flBottom;
- 
+
     OKButton m_acceptButton;
     CancelButton m_declineButton;
 
@@ -121,7 +121,7 @@ struct LicenseDialogImpl : public ModalDialog
         const ::rtl::OUString & sLicenseText);
 
     virtual void Activate();
-    
+
 };
 
 LicenseView::LicenseView( Window* pParent, const ResId& rResId )
@@ -215,13 +215,6 @@ LicenseDialogImpl::LicenseDialogImpl(
 
 {
 
-    if (GetSettings().GetStyleSettings().GetHighContrastMode())
-    {
-        // high contrast mode needs other images
-        m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-        m_fiArrow2.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-    }
-
     FreeResource();
 
     m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT);
@@ -229,7 +222,7 @@ LicenseDialogImpl::LicenseDialogImpl(
     m_fiArrow2.Show(false);
     m_mlLicense.SetText(sLicenseText);
     m_ftHead.SetText(m_ftHead.GetText() + OUString('\n') + sExtensionName);
-    
+
     m_mlLicense.SetEndReachedHdl( LINK(this, LicenseDialogImpl, EndReachedHdl) );
     m_mlLicense.SetScrolledHdl( LINK(this, LicenseDialogImpl, ScrolledHdl) );
     m_pbDown.SetClickHdl( LINK(this, LicenseDialogImpl, PageDownHdl) );
@@ -307,7 +300,7 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
 //______________________________________________________________________________
 void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException)
 {
- 
+
 }
 
 //______________________________________________________________________________