summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2010-11-16 16:59:53 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2010-11-16 16:59:53 +0100
commit426c475067b95b6427c1945b4024008f18554dd0 (patch)
tree98341d18a28ec2c2b1c1fdccef15c861fe8ae259
parentcb6465a5e22cd7599931ed1c03005def6c02c4cd (diff)
Remove _HC usage in cui
-rw-r--r--cui/source/options/dbregister.cxx3
-rw-r--r--cui/source/options/optpath.src5
-rw-r--r--cui/source/options/readonlyimage.cxx3
-rw-r--r--cui/source/options/readonlyimage.src10
4 files changed, 2 insertions, 19 deletions
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index bc856f37ad20..8c0d0c3fc9fe 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 6b02abb5764a..7114f90b8de9 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 763b3557a886..274c1eaf7478 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 bd63c32771e7..3810f022fac9 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; };
-};