Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 8eb585d717541257932fc840c8fee522114396fa..b846641e15556a217053a245a120862089c46181 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -24,7 +24,9 @@ namespace lyx {
 
 Branch::Branch() : selected_(false)
 {
-       theApp()->getRgbColor(Color::background, color_);
+       // no theApp() with command line export
+       if (theApp())
+               theApp()->getRgbColor(Color_background, color_);
 }
 
 
@@ -67,13 +69,13 @@ void Branch::setColor(RGBColor const & c)
 }
 
 
-void Branch::setColor(string const & c)
+void Branch::setColor(string const & str)
 {
-       if (c.size() == 7 && c[0] == '#')
-               color_ = RGBColor(c);
+       if (str.size() == 7 && str[0] == '#')
+               color_ = rgbFromHexName(str);
        else
                // no color set or invalid color - use normal background
-               theApp()->getRgbColor(Color::background, color_);
+               theApp()->getRgbColor(Color_background, color_);
 }