Do not try to set LyX-side display colors from within the Buffer reading

routines.

See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg159389.html.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34103 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6bd4ab12b0a1d85ffcadb4b887276e1046a4b502..80b136d75faa4036c73b9bb8c6728994d602491c 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -672,11 +672,7 @@ int Buffer::readHeader(Lexer & lex)
        params().fontcolor = lyx::rgbFromHexName("#000000");
        params().isfontcolor = false;
        params().notefontcolor = lyx::rgbFromHexName("#cccccc");
-       lyx::dispatch(FuncRequest(LFUN_SET_COLOR,
-               from_ascii("greyedouttext #cccccc")));
        params().boxbgcolor = lyx::rgbFromHexName("#ff0000");
-       lyx::dispatch(FuncRequest(LFUN_SET_COLOR,
-               from_ascii("shaded #ff0000")));
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 6ca616ae38bec104a259532f6ccd68554fbb1b6d..c8da4d15e599c9274a50c6ccdb2aab03822ceb58 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -737,14 +737,10 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                lex.eatLine();
                string color = lex.getString();
                notefontcolor = lyx::rgbFromHexName(color);
-               // set the font color within LyX
-               lcolor.setColor(Color_greyedouttext, color);
        } else if (token == "\\boxbgcolor") {
                lex.eatLine();
                string color = lex.getString();
                boxbgcolor = lyx::rgbFromHexName(color);
-               // set the font color within LyX
-               lcolor.setColor(Color_shadedbg, color);
        } else if (token == "\\paperwidth") {
                lex >> paperwidth;
        } else if (token == "\\paperheight") {