[Libreoffice-commits] .: cui/source

[Sebastian Spaeth]

 cui/source/options/dbregister.cxx    |    3 +--
 cui/source/options/optpath.src       |    5 -----
 cui/source/options/readonlyimage.cxx |    3 +--
 cui/source/options/readonlyimage.src |   10 ----------
 4 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 3ebe15b7e85d3e4717d3905325341f8c2ffbe3c2
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Nov 16 16:59:53 2010 +0100

    Remove _HC usage in cui

diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 1730276..67f0c1a 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -413,8 +413,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co
     SvLBoxEntry* pEntry = NULL;
     if ( _bReadOnly )
     {
-        sal_Bool bHighContrast = pPathBox->GetDisplayBackground().GetColor().IsDark();
-        Image aLocked( CUI_RES( bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ) );
+        Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) );
         pEntry = pPathBox->InsertEntry( aStr, aLocked, aLocked );
     }
     else
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 22e4557..b31efb0 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -86,11 +86,6 @@ TabPage RID_SFXPAGE_PATH
         ImageBitmap = Bitmap { File = "lock.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_LOCK_HC
-    {
-        ImageBitmap = Bitmap { File = "lock_hc.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     String STR_MULTIPATHDLG
     {
         Text [ en-US ] = "Edit Paths: %1" ;
diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index 46d35c3..fa299b9 100644
--- a/cui/source/options/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -37,8 +37,7 @@
 ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
             FixedImage(pParent, rResId)
 {
-    sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
+    SetImage( Image(CUI_RES( RID_SVXBMP_LOCK )));
 }
 
 ReadOnlyImage::~ReadOnlyImage()
diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src
index d489e7c..a2cc82b 100644
--- a/cui/source/options/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -25,8 +25,6 @@
  *
  ************************************************************************/
 
- // include ---------------------------------------------------------------
-
 #include <cuires.hrc>
 
 String RID_SVXSTR_READONLY_CONFIG_TIP
@@ -41,12 +39,4 @@ Image RID_SVXBMP_LOCK
     };
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
-Image RID_SVXBMP_LOCK_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "lock_hc.bmp";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};