diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 2fdd0caccd64..18b3612259e6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -262,38 +262,6 @@
Contains settings that affect the window layout.
-
-
- Contains settings that control highlighting.
-
-
-
-
-
- Specifies the color of highlighted values.
-
-
- 255
-
-
-
-
-
- Specifies the color of highlighted formulas.
-
-
- 32768
-
-
-
-
-
- Specifies the color of the highlighted text.
-
-
- 0
-
-
Contains settings that control visual aids.
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 965d1ac73b69..8bc3d380b28a 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -94,15 +94,6 @@ public:
void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;}
Color const & GetGridColor( OUString* pStrName = nullptr ) const;
- void SetValueColor( const Color& rCol ) { aValueCol = rCol; }
- Color const & GetValueColor() const { return aValueCol; }
-
- void SetFormulaColor(const Color& rCol) { aFormulaCol = rCol; }
- Color const & GetFormulaColor() const { return aFormulaCol; }
-
- void SetTextColor(const Color& rCol) { aTextCol = rCol; }
- Color const & GetTextColor() const { return aTextCol; }
-
const ScGridOptions& GetGridOptions() const { return aGridOpt; }
void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
SvxGridItem* CreateGridItem() const;
@@ -117,9 +108,6 @@ private:
Color aGridCol;
OUString aGridColName;
ScGridOptions aGridOpt;
- Color aValueCol;
- Color aFormulaCol;
- Color aTextCol;
};
// Item for the options dialog - View
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index eef9125424bb..d882e82e6fd2 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -132,10 +132,6 @@ void ScViewOptions::SetDefaults()
aGridCol = SC_STD_GRIDCOLOR;
aGridColName = ScGlobal::GetRscString( STR_GRIDCOLOR );
- aValueCol = COL_LIGHTBLUE;
- aTextCol = COL_BLACK;
- aFormulaCol = COL_GREEN;
-
aGridOpt.SetDefaults();
}
@@ -157,9 +153,6 @@ ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
aGridCol = rCpy.aGridCol;
aGridColName = rCpy.aGridColName;
aGridOpt = rCpy.aGridOpt;
- aValueCol = rCpy.aValueCol;
- aTextCol = rCpy.aTextCol;
- aFormulaCol = rCpy.aFormulaCol;
return *this;
}
@@ -175,9 +168,6 @@ bool ScViewOptions::operator==( const ScViewOptions& rOpt ) const
bEqual = bEqual && (aGridCol == rOpt.aGridCol);
bEqual = bEqual && (aGridColName == rOpt.aGridColName);
bEqual = bEqual && (aGridOpt == rOpt.aGridOpt);
- bEqual = bEqual && (aValueCol == rOpt.aValueCol);
- bEqual = bEqual && (aTextCol == rOpt.aTextCol);
- bEqual = bEqual && (aFormulaCol == rOpt.aFormulaCol);
return bEqual;
}
@@ -240,9 +230,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCLAYOUTOPT_SHEETTAB 7
#define SCLAYOUTOPT_OUTLINE 8
#define SCLAYOUTOPT_GRID_ONCOLOR 9
-#define SCLAYOUTOPT_VALUE_COLOR 10
-#define SCLAYOUTOPT_FORMULA_COLOR 11
-#define SCLAYOUTOPT_TEXT_COLOR 12
#define CFGPATH_DISPLAY "Office.Calc/Content/Display"
@@ -280,10 +267,7 @@ Sequence ScViewCfg::GetLayoutPropertyNames()
"Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
"Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
"Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
- "Line/GridOnColoredCells", // SCLAYOUTOPT_GRID_ONCOLOR
- "Highlighting/ValueColor", // SCLAYOUTOPT_VALUE_COLOR
- "Highlighting/FormulaColor",// SCLAYOUTOPT_FORMULA_COLOR
- "Highlighting/TextColor"}; // SCLAYOUTOPT_TEXT_COLOR
+ "Line/GridOnColoredCells"}; // SCLAYOUTOPT_GRID_ONCOLOR;
}
Sequence ScViewCfg::GetDisplayPropertyNames()
@@ -371,18 +355,6 @@ ScViewCfg::ScViewCfg() :
case SCLAYOUTOPT_OUTLINE:
SetOption( VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
- case SCLAYOUTOPT_VALUE_COLOR:
- if (pValues[nProp] >>= nIntVal)
- SetValueColor(Color(nIntVal));
- break;
- case SCLAYOUTOPT_FORMULA_COLOR:
- if (pValues[nProp] >>= nIntVal)
- SetFormulaColor(Color(nIntVal));
- break;
- case SCLAYOUTOPT_TEXT_COLOR:
- if (pValues[nProp] >>= nIntVal)
- SetTextColor(Color(nIntVal));
- break;
}
}
}
@@ -547,15 +519,6 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void)
case SCLAYOUTOPT_OUTLINE:
pValues[nProp] <<= GetOption( VOPT_OUTLINER );
break;
- case SCLAYOUTOPT_VALUE_COLOR:
- pValues[nProp] <<= GetValueColor();
- break;
- case SCLAYOUTOPT_FORMULA_COLOR:
- pValues[nProp] <<= GetFormulaColor();
- break;
- case SCLAYOUTOPT_TEXT_COLOR:
- pValues[nProp] <<= GetTextColor();
- break;
}
}
aLayoutItem.PutProperties(aNames, aValues);
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index dd02675f078e..6ac52a2d1cd6 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -39,10 +39,6 @@ class ScTpContentOptions : public SfxTabPage
VclPtr pBreakCB;
VclPtr pGuideLineCB;
- VclPtr pValueColorLB;
- VclPtr pFormulaColorLB;
- VclPtr pTextColorLB;
-
VclPtr pFormulaCB;
VclPtr pNilCB;
VclPtr pAnnotCB;
@@ -66,7 +62,6 @@ class ScTpContentOptions : public SfxTabPage
ScViewOptions* pLocalOptions;
void InitGridOpt();
- void InitColors();
DECL_LINK( GridHdl, ListBox&, void );
DECL_LINK( SelLbObjHdl, ListBox&, void );
DECL_LINK( CBHdl, Button*, void );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index d1811ca6dec9..a7151bded5e7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -49,10 +49,6 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent,
get(pBreakCB,"break");
get(pGuideLineCB,"guideline");
- get(pValueColorLB, "value_color");
- get(pFormulaColorLB, "formula_color");
- get(pTextColorLB, "text_color");
-
get(pFormulaCB,"formula");
get(pNilCB,"nil");
get(pAnnotCB,"annot");
@@ -111,9 +107,6 @@ void ScTpContentOptions::dispose()
pColorLB.clear();
pBreakCB.clear();
pGuideLineCB.clear();
- pValueColorLB.clear();
- pFormulaColorLB.clear();
- pTextColorLB.clear();
pFormulaCB.clear();
pNilCB.clear();
pAnnotCB.clear();
@@ -159,16 +152,10 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
pOutlineCB ->IsValueChangedFromSaved() ||
pColorLB ->IsValueChangedFromSaved() ||
pBreakCB ->IsValueChangedFromSaved() ||
- pGuideLineCB ->IsValueChangedFromSaved() ||
- pValueColorLB ->IsValueChangedFromSaved() ||
- pFormulaColorLB->IsValueChangedFromSaved() ||
- pTextColorLB ->IsValueChangedFromSaved() )
+ pGuideLineCB ->IsValueChangedFromSaved())
{
NamedColor aNamedColor = pColorLB->GetSelectedEntry();
pLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
- pLocalOptions->SetValueColor(pValueColorLB->GetSelectedEntry().first);
- pLocalOptions->SetFormulaColor(pFormulaColorLB->GetSelectedEntry().first);
- pLocalOptions->SetTextColor(pTextColorLB->GetSelectedEntry().first);
rCoreSet->Put(ScTpViewItem(*pLocalOptions));
bRet = true;
}
@@ -212,7 +199,6 @@ void ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
pOutlineCB->Check( pLocalOptions->GetOption(VOPT_OUTLINER) );
InitGridOpt();
- InitColors();
pBreakCB->Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
pGuideLineCB->Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
@@ -243,9 +229,6 @@ void ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
pColorLB->SaveValue();
pBreakCB->SaveValue();
pGuideLineCB->SaveValue();
- pValueColorLB->SaveValue();
- pFormulaColorLB->SaveValue();
- pTextColorLB->SaveValue();
}
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -332,18 +315,6 @@ void ScTpContentOptions::InitGridOpt()
pColorLB->SelectEntry(std::make_pair(aCol, aName));
}
-void ScTpContentOptions::InitColors()
-{
- Color aCol = pLocalOptions->GetValueColor();
- pValueColorLB->SelectEntry(aCol);
-
- aCol = pLocalOptions->GetFormulaColor();
- pFormulaColorLB->SelectEntry(aCol);
-
- aCol = pLocalOptions->GetTextColor();
- pTextColorLB->SelectEntry(aCol);
-}
-
IMPL_LINK( ScTpContentOptions, GridHdl, ListBox&, rLb, void )
{
sal_Int32 nSelPos = rLb.GetSelectedEntryPos();
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 0e322ceca8ab..a5bf884681ad 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -61,7 +61,6 @@
#include
#include
#include
-#include
#include
#include
@@ -296,10 +295,9 @@ void ScOutputData::SetSyntaxMode( bool bNewMode )
if (bNewMode)
if (!pValueColor)
{
- const ScViewOptions& rOptions = mpDoc->GetViewOptions();
- pValueColor = new Color(rOptions.GetValueColor());
- pTextColor = new Color(rOptions.GetTextColor());
- pFormulaColor = new Color(rOptions.GetFormulaColor());
+ pValueColor = new Color(COL_LIGHTBLUE);
+ pTextColor = new Color(COL_BLACK);
+ pFormulaColor = new Color(COL_GREEN);
}
}
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index ff3e855119f3..349a28a2d999 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -472,142 +472,6 @@
1
-
-
-
- 0
- 1
- 1
- 1
-
-
0
- 2
+ 1
1
1
@@ -786,7 +650,7 @@
0
- 3
+ 2
1
1