diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2018-03-23 18:17:31 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2018-03-23 20:48:41 +0100 |
commit | 154496aefe67b81f80d7c08d12bfb145eddb93ac (patch) | |
tree | f986989c31b4d66f545e91b5cd7b0fda6686a8e2 /sc/source/ui | |
parent | 524cf62841783b88fe2fd5d68c0c151232880269 (diff) |
Revert "tdf#116241 Customizing value highlighting colors"
This reverts commit fb29b8262488d045a926504725669a362bacb5bb.
Change-Id: I338af7c108bb6386193550ef0603b406c4f7bd99
Reaseon: I will move this to more suitable place "application colors" and extend with protected cell backround.
Reviewed-on: https://gerrit.libreoffice.org/51789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/inc/tpview.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 31 | ||||
-rw-r--r-- | sc/source/ui/view/output.cxx | 8 |
3 files changed, 4 insertions, 40 deletions
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<CheckBox> pBreakCB; VclPtr<CheckBox> pGuideLineCB; - VclPtr<SvxColorListBox> pValueColorLB; - VclPtr<SvxColorListBox> pFormulaColorLB; - VclPtr<SvxColorListBox> pTextColorLB; - VclPtr<CheckBox> pFormulaCB; VclPtr<CheckBox> pNilCB; VclPtr<CheckBox> 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 <scmod.hxx> #include <appoptio.hxx> #include <postit.hxx> -#include <viewopti.hxx> #include <scresid.hxx> #include <colorscale.hxx> @@ -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); } } |