Extract out MapFromXmlAsStringValue.HEADmain

1 files changed, 3 insertions, 7 deletions

diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp
index 9283b828..0fd0731b 100644
--- a/src/ui/mapper/ColorMapper.cpp
+++ b/src/ui/mapper/ColorMapper.cpp
@@ -11,19 +11,15 @@ Color ColorMapper::DoMapFromString(std::string str) {
 }
 
 Color ColorMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
-  Color result = colors::transparent;
-  if (value_attr) {
-    result = DoMapFromString(*value_attr);
-  }
+  auto value = MapFromXmlAsStringValue(node, colors::transparent);
 
   auto alpha_value_attr =
       node->GetOptionalAttributeValueCaseInsensitive("alpha");
   if (alpha_value_attr) {
-    result.alpha =
+    value.alpha =
         cru::string::ParseToNumber<double>(*alpha_value_attr).value * 255;
   }
 
-  return result;
+  return value;
 }
 }  // namespace cru::ui::mapper