X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FIndicesList.cpp;h=26881549a179edd908ebcece02b22347362fb084;hb=f3ee4a0a493fa96be99f5bbc7ee9de00a5f69b34;hp=a73dbb90b042be053f81db83c8e918fc46d7b223;hpb=c52bd08442214e4d768ee73886dee68e2b812cd1;p=lyx.git diff --git a/src/IndicesList.cpp b/src/IndicesList.cpp index a73dbb90b0..26881549a1 100644 --- a/src/IndicesList.cpp +++ b/src/IndicesList.cpp @@ -30,7 +30,9 @@ namespace { class IndexNamesEqual : public std::unary_function { public: - IndexNamesEqual(docstring const & name) : name_(name) {} + IndexNamesEqual(docstring const & name) + : name_(name) + {} bool operator()(Index const & index) const { @@ -44,7 +46,9 @@ private: class IndexHasShortcut : public std::unary_function { public: - IndexHasShortcut(docstring const & shortcut) : shortc_(shortcut) {} + IndexHasShortcut(docstring const & shortcut) + : shortc_(shortcut) + {} bool operator()(Index const & index) const { @@ -69,6 +73,8 @@ Index::Index() // no theApp() with command line export if (theApp()) theApp()->getRgbColor(Color_indexlabel, color_); + else + frontend::Application::getRgbColorUncached(Color_indexlabel, color_); } @@ -112,9 +118,14 @@ void Index::setColor(string const & str) { if (str.size() == 7 && str[0] == '#') color_ = rgbFromHexName(str); - else + else { // no color set or invalid color -- use predefined color - theApp()->getRgbColor(Color_indexlabel, color_); + // no theApp() with command line export + if (theApp()) + theApp()->getRgbColor(Color_indexlabel, color_); + else + frontend::Application::getRgbColorUncached(Color_indexlabel, color_); + } }