tdf#116241 Customizing value highlighting colors

Available in: Tools->Options->Application colors

Change-Id: I6e4f7a0dcad9a6ee222275019596853f0cbd3ab0
Reviewed-on: https://gerrit.libreoffice.org/51791Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/51943Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

cui/source/options/optcolor.cxx

@@ -141,6 +141,10 @@ const vEntryInfo[] =
     { Group_Calc,    IDS(deterror) },
     { Group_Calc,    IDS(ref) },
     { Group_Calc,    IDS(notes) },
+    { Group_Calc,    IDS(values) },
+    { Group_Calc,    IDS(formulas) },
+    { Group_Calc,    IDS(text) },
+    { Group_Calc,    IDS(protectedcells) },
 
     { Group_Draw,    IDS(drawgrid) },
 

include/svtools/colorcfg.hxx

@@ -61,6 +61,10 @@ enum ColorConfigEntry
     CALCDETECTIVEERROR       ,
     CALCREFERENCE       ,
     CALCNOTESBACKGROUND     ,
+    CALCVALUE,
+    CALCFORMULA,
+    CALCTEXT,
+    CALCPROTECTEDBACKGROUND,
     DRAWGRID            ,
     BASICIDENTIFIER,
     BASICCOMMENT   ,

officecfg/registry/data/org/openoffice/Office/UI.xcu

@@ -323,6 +323,26 @@
             <value xsi:nil="true"/>
           </prop>
         </node>
+        <node oor:name="CalcValue">
+          <prop oor:name="Color">
+            <value xsi:nil="true"/>
+          </prop>
+        </node>
+        <node oor:name="CalcFormula">
+          <prop oor:name="Color">
+            <value xsi:nil="true"/>
+          </prop>
+        </node>
+        <node oor:name="CalcText">
+          <prop oor:name="Color">
+            <value xsi:nil="true"/>
+          </prop>
+        </node>
+        <node oor:name="CalcProtectedBackground">
+          <prop oor:name="Color">
+            <value xsi:nil="true"/>
+          </prop>
+        </node>
         <node oor:name="DrawGrid">
           <prop oor:name="IsVisible">
             <value>true</value>

officecfg/registry/schema/org/openoffice/Office/UI.xcs

@@ -410,6 +410,46 @@
           </info>
         </prop>
       </group>
+      <group oor:name="CalcValue">
+        <info>
+          <desc>Specifies the settings used for values in Calc.</desc>
+        </info>
+        <prop oor:name="Color" oor:type="xs:int">
+          <info>
+            <desc>Specifies the color used for values.</desc>
+          </info>
+        </prop>
+      </group>
+      <group oor:name="CalcFormula">
+        <info>
+          <desc>Specifies the settings used for formulas in Calc.</desc>
+        </info>
+        <prop oor:name="Color" oor:type="xs:int">
+          <info>
+            <desc>Specifies the color used for formulas.</desc>
+          </info>
+        </prop>
+      </group>
+      <group oor:name="CalcText">
+        <info>
+          <desc>Specifies the settings used for the text in Calc.</desc>
+        </info>
+        <prop oor:name="Color" oor:type="xs:int">
+          <info>
+            <desc>Specifies the color used for the text.</desc>
+          </info>
+        </prop>
+      </group>
+      <group oor:name="CalcProtectedBackground">
+        <info>
+          <desc>Specifies the settings used for the background of protected cells in Calc.</desc>
+        </info>
+        <prop oor:name="Color" oor:type="xs:int">
+          <info>
+            <desc>Specifies the color used for the background of protected cells.</desc>
+          </info>
+        </prop>
+      </group>
       <group oor:name="DrawGrid">
         <info>
           <desc>Specifies the settings used for the grid in Draw/Impress.</desc>

sc/inc/global.hxx

@@ -518,7 +518,6 @@ class ScGlobal
     static SvxBrushItem*    pEmptyBrushItem;
     static SvxBrushItem*    pButtonBrushItem;
     static SvxBrushItem*    pEmbeddedBrushItem;
-    static SvxBrushItem*    pProtectedBrushItem;
 
     static ImageList*       pOutlineBitmaps;
 
@@ -601,7 +600,6 @@ public:
     static void             InitTextHeight(SfxItemPool* pPool);
     static SvxBrushItem*    GetEmptyBrushItem() { return pEmptyBrushItem; }
     static SvxBrushItem*    GetButtonBrushItem();
-    static SvxBrushItem*    GetProtectedBrushItem() { return pProtectedBrushItem; }
     SC_DLLPUBLIC    static const OUString&    GetEmptyOUString();
 
     /** Returns the specified image list with outline symbols. */

sc/source/core/data/global.cxx

@@ -45,6 +45,7 @@
 #include <ctype.h>
 #include <numeric>
 #include <svx/svdmodel.hxx>
+#include <svtools/colorcfg.hxx>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -109,7 +110,6 @@ OUString*       ScGlobal::pStrClipDocName = nullptr;
 SvxBrushItem*   ScGlobal::pEmptyBrushItem = nullptr;
 SvxBrushItem*   ScGlobal::pButtonBrushItem = nullptr;
 SvxBrushItem*   ScGlobal::pEmbeddedBrushItem = nullptr;
-SvxBrushItem*   ScGlobal::pProtectedBrushItem = nullptr;
 
 ImageList*      ScGlobal::pOutlineBitmaps = nullptr;
 
@@ -509,7 +509,6 @@ void ScGlobal::Init()
     pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND );
     pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND );
     pEmbeddedBrushItem = new SvxBrushItem( Color( COL_LIGHTCYAN ), ATTR_BACKGROUND );
-    pProtectedBrushItem = new SvxBrushItem( Color( COL_LIGHTGRAY ), ATTR_BACKGROUND );
 
     InitPPT();
     //ScCompiler::InitSymbolsNative();
@@ -609,7 +608,6 @@ void ScGlobal::Clear()
     DELETEZ(pEmptyBrushItem);
     DELETEZ(pButtonBrushItem);
     DELETEZ(pEmbeddedBrushItem);
-    DELETEZ(pProtectedBrushItem);
     DELETEZ(pOutlineBitmaps);
     DELETEZ(pEnglishFormatter);
     DELETEZ(pCaseTransliteration);

sc/source/ui/view/output.cxx

@@ -298,12 +298,13 @@ void ScOutputData::SetSingleGrid( bool bNewMode )
 void ScOutputData::SetSyntaxMode( bool bNewMode )
 {
     mbSyntaxMode = bNewMode;
-    if (bNewMode)
-        if (!pValueColor)
+    if ( bNewMode )
+        if ( !pValueColor )
         {
-            pValueColor = new Color( COL_LIGHTBLUE );
-            pTextColor = new Color( COL_BLACK );
-            pFormulaColor = new Color( COL_GREEN );
+            const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig();
+            pValueColor = new Color( rColorCfg.GetColorValue( svtools::CALCVALUE ).nColor );
+            pTextColor = new Color( rColorCfg.GetColorValue( svtools::CALCTEXT ).nColor );
+            pFormulaColor = new Color( rColorCfg.GetColorValue( svtools::CALCFORMULA ).nColor );
         }
 }
 
@@ -1001,6 +1002,12 @@ void ScOutputData::DrawBackground(vcl::RenderContext& rRenderContext)
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     long nPosY = nScrY;
+
+    const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig();
+    Color aProtectedColor( rColorCfg.GetColorValue( svtools::CALCPROTECTEDBACKGROUND ).nColor );
+    std::shared_ptr<SvxBrushItem> pProtectedBackground( new SvxBrushItem( aProtectedColor, ATTR_BACKGROUND ) );
+
+    // iterate through the rows to show
     for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++)
     {
         RowInfo* pThisRowInfo = &pRowInfo[nArrY];
@@ -1034,7 +1041,7 @@ void ScOutputData::DrawBackground(vcl::RenderContext& rRenderContext)
                     aRect = rRenderContext.PixelToLogic(aRect); // internal data in pixels, but we'll be drawing in logic units
 
                 const SvxBrushItem* pOldBackground = nullptr;
-                const SvxBrushItem* pBackground;
+                const SvxBrushItem* pBackground = nullptr;
                 const Color* pOldColor = nullptr;
                 const ScDataBarInfo* pOldDataBarInfo = nullptr;
                 const ScIconSetInfo* pOldIconSetInfo = nullptr;
@@ -1060,7 +1067,7 @@ void ScOutputData::DrawBackground(vcl::RenderContext& rRenderContext)
                             const ScProtectionAttr& rProt = static_cast<const ScProtectionAttr&>(
                                                                 pP->GetItem(ATTR_PROTECTION));
                             if (rProt.GetProtection() || rProt.GetHideCell())
-                                pBackground = ScGlobal::GetProtectedBrushItem();
+                                pBackground = pProtectedBackground.get();
                             else
                                 pBackground = ScGlobal::GetEmptyBrushItem();
                         }
@@ -1071,7 +1078,7 @@ void ScOutputData::DrawBackground(vcl::RenderContext& rRenderContext)
                         pBackground = pInfo->pBackground;
 
                     if ( bPagebreakMode && !pInfo->bPrinted )
-                        pBackground = ScGlobal::GetProtectedBrushItem();
+                        pBackground = pProtectedBackground.get();
 
                     if ( pInfo->nRotateDir > ScRotateDir::Standard &&
                             pBackground->GetColor().GetTransparency() != 255 &&

svtools/source/config/colorcfg.cxx

@@ -146,6 +146,10 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
         { RTL_CONSTASCII_USTRINGPARAM("/CalcDetectiveError")   ,false },
         { RTL_CONSTASCII_USTRINGPARAM("/CalcReference")   ,false },
         { RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,false },
+        { RTL_CONSTASCII_USTRINGPARAM("/CalcValue") ,false },
+        { RTL_CONSTASCII_USTRINGPARAM("/CalcFormula") ,false },
+        { RTL_CONSTASCII_USTRINGPARAM("/CalcText") ,false },
+        { RTL_CONSTASCII_USTRINGPARAM("/CalcProtectedBackground") ,false },
         { RTL_CONSTASCII_USTRINGPARAM("/DrawGrid")        ,true },
         { RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"),  false },
         { RTL_CONSTASCII_USTRINGPARAM("/BASICComment")   ,  false },
@@ -434,6 +438,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         COL_LIGHTRED, // CALCDETECTIVEERROR
         0xef0fff, // CALCREFERENCE
         0xffffc0, // CALCNOTESBACKGROUND
+        COL_LIGHTBLUE, // CALCVALUE
+        COL_GREEN, // CALCFORMULA
+        COL_BLACK, // CALCTEXT
+        COL_LIGHTGRAY, // CALCPROTECTEDBACKGROUND
         COL_LIGHTGRAY, // DRAWGRID
         COL_GREEN, // BASICIDENTIFIER,
         COL_GRAY, // BASICCOMMENT,