Only set buffer if it is not null.

[lyx.git] / src / mathed / MathExtern.cpp

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 311b32389533edb494223d0c3ef8a01f3737b8ba..4d53b28245679d47f90fbad8591f7395c9339601 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -75,7 +75,7 @@ static char const * function_names[] = {
        "det", "dim", "exp", "gcd", "hom", "inf", "ker",
        "lg", "lim", "liminf", "limsup", "ln", "log",
        "max", "min", "sec", "sin", "sinh", "sup",
-       "tan", "tanh", "Pr", 0
+       "tan", "tanh", "Pr", nullptr
 };
 
 static size_t const npos = lyx::docstring::npos;
@@ -1026,7 +1026,7 @@ namespace {
                       << "\ninput: '" << data << "'" << endl;
                cmd_ret const ret = runCommand(command);
                cas_tmpfile.removeFile();
-               return ret.second;
+               return ret.result;
        }
 
        size_t get_matching_brace(string const & str, size_t i)
@@ -1454,7 +1454,7 @@ void writeString(docstring const & s, WriteStream & os)
                                case WriteStream::wsDefault:
                                default:
                                        // throw again
-                                       throw(e);
+                                       throw;
                                }
                        }
                }
@@ -1528,7 +1528,7 @@ void writeString(docstring const & s, WriteStream & os)
                        case WriteStream::wsDefault:
                        default:
                                // throw again
-                               throw(e);
+                               throw;
                        }
                }
        }