Fix default label setting (eq:)

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index d17e15ae70417230a076da2a962e9ddde0875f21..671fd0f22c513d7156bb7e3fc9ed02973eb06ecd 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-10  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * math_hullinset (doDispatch): fix default label setting (eq:)
+
 2006-01-01    <larsbj@gullik.net>
 
        * command_inset.C (editXY): unused parameters

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index c13b2753b360ab431cd875b5990cd06e20cd3fdf..40808872ecd3dfe39b440c8415eb2c5aed9a1e14 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1046,8 +1046,10 @@ void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                string old_label = label(r);
                string const default_label =
                        (lyxrc.label_init_length >= 0) ? "eq:" : "";
+               if (old_label.empty())
+                       old_label = default_label;
                string const contents = cmd.argument.empty() ?
-                       label(r) : cmd.argument;
+                       old_label : cmd.argument;
 
                InsetCommandParams p("label", contents);
                string const data = InsetCommandMailer::params2string("label", p);