summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-23 12:39:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-23 14:58:02 +0000
commit8b3bfa53c9ed62ea4d744ae0d874241b8fb27a81 (patch)
tree50c1c2c89ef89bf17046fd8c05b52fc5f4d64b83
parent8ac384a5ca391693773478210b6334862967ae30 (diff)
SvtAccessibilityOptions::GetIsForBorders is no longer used
-rw-r--r--sc/source/ui/app/inputhdl.cxx1
-rw-r--r--sc/source/ui/view/output.cxx4
-rw-r--r--sc/source/ui/view/output2.cxx3
-rw-r--r--svtools/inc/svtools/accessibilityoptions.hxx1
-rw-r--r--svtools/source/config/accessibilityoptions.cxx5
-rw-r--r--sw/source/ui/table/tautofmt.cxx3
6 files changed, 1 insertions, 16 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 7232ad3e7aa4..9fdaf2ccde43 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2029,7 +2029,6 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
Color aBackCol = ((const SvxBrushItem&)
pPattern->GetItem( ATTR_BACKGROUND )).GetColor();
ScModule* pScMod = SC_MOD();
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
if ( aBackCol.GetTransparency() > 0 ||
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index c9233c59e8a7..b892c51701bf 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -797,7 +797,6 @@ void ScOutputData::DrawBackground()
sal_Bool bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
sal_Bool bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
sal_Bool bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -915,7 +914,6 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
pDev->SetLineColor();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
Color aAutoTextColor;
if ( bCellContrast )
@@ -1126,7 +1124,6 @@ void ScOutputData::DrawFrame()
Color aSingleColor;
sal_Bool bUseSingleColor = false;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
// if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
@@ -1325,7 +1322,6 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const SfxItemSet* pCondSet;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
// color (pForceColor) is determined externally, including DrawMode changes
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ab9783ea250b..7913a09c3e11 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -205,7 +205,6 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, sal_Bool bPTL) :
bPixelToLogic( bPTL )
{
ScModule* pScMod = SC_MOD();
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
bCellContrast = pOutput->bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -2231,7 +2230,6 @@ void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor)
return;
sal_Int32 nConfBackColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
bool bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -4668,7 +4666,6 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
ScModule* pScMod = SC_MOD();
sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
- // SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
sal_Bool bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 7038bac04116..7783eb7091d5 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -48,7 +48,6 @@ public:
virtual ~SvtAccessibilityOptions();
// get & set config entries
- sal_Bool GetIsForBorders() const; // obsolete!
sal_Bool GetIsForPagePreviews() const;
sal_Bool GetIsHelpTipsDisappear() const;
sal_Bool GetIsAllowAnimatedGraphics() const;
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index f643f52495a4..44ab3e4e072a 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -545,11 +545,6 @@ void SvtAccessibilityOptions::Commit()
// -----------------------------------------------------------------------
-sal_Bool SvtAccessibilityOptions::GetIsForBorders() const
-{
- OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
- return sal_False;
-}
sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
{
return sm_pSingleImplConfig->GetAutoDetectSystemHC();
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index ad9acbd06509..efe3c9135253 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -968,8 +968,7 @@ void AutoFmtPreview::NotifyChange( const SwTableAutoFmt& rNewData )
void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ )
{
sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
- if( GetSettings().GetStyleSettings().GetHighContrastMode() &&
- SW_MOD()->GetAccessibilityOptions().GetIsForBorders() )
+ if( GetSettings().GetStyleSettings().GetHighContrastMode() )
aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
Bitmap thePreview;