better databar negative color and axis color import

Should finally handle themed colors and tints. There seem to be a few
issue left that I need to understand.

Change-Id: Icdd0a2d26519eb1c4171d6888913ba2c6944a443

1 files changed, 5 insertions, 4 deletions

diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 18523d8675d7..32042cef3d63 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -224,15 +224,15 @@ struct ExCfRuleModel
     bool mbGradient;
     OUString maAxisPosition;
     // AxisColor
-    sal_uInt32 mnAxisColor;
+    ::Color mnAxisColor;
     // NegativeFillColor
-    sal_uInt32 mnNegativeColor;
+    ::Color mnNegativeColor;
     // Cfvo
     bool mbIsLower;
     OUString maColorScaleType;
 };
 
-class ExtCfRule
+class ExtCfRule : public WorksheetHelper
 {
     enum RuleType
     {
@@ -246,7 +246,8 @@ class ExtCfRule
     RuleType mnRuleType;
     ScDataBarFormatData* mpTarget;
 public:
-    ExtCfRule(ScDataBarFormatData* pTarget = NULL ) : mnRuleType( ExtCfRule::UNKNOWN ), mpTarget(pTarget) {}
+
+    ExtCfRule(ScDataBarFormatData* pTarget, WorksheetHelper& rParent);
     void finalizeImport();
     void importDataBar(  const AttributeList& rAttribs );
     void importNegativeFillColor(  const AttributeList& rAttribs );