anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6793: Changing an existing formula type to displayed formula loses the label

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35178 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-08-19 13:58:36 +00:00
parent c9a24bbd88
commit fa0cd9ad60
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mathed/InsetMathHull.cpp
View File

@ -897,12 +897,20 @@ docstring InsetMathHull::nicelabel(row_type row) const
}
void InsetMathHull::glueall()
void InsetMathHull::glueall(HullType type)
{
MathData ar;
for (idx_type i = 0; i < nargs(); ++i)
ar.append(cell(i));
InsetLabel * label = 0;
if (type == hullEquation) {
// preserve the label
label = label_[0];
label_[0] = 0;
}
*this = InsetMathHull(buffer_, hullSimple);
if (label)
label_[0] = label;
cell(0) = ar;
setDefaults();
}
@ -1013,7 +1021,6 @@ void InsetMathHull::mutate(HullType newtype)
numbered(0, false);
} else {
setType(hullEquation);
numbered(0, false);
mutate(newtype);
}
}
@ -1039,15 +1046,6 @@ void InsetMathHull::mutate(HullType newtype)
else if (type_ == hullEqnArray) {
if (newtype < type_) {
// set correct (no)numbering
nonum_[0] = true;
for (row_type row = 0; row < nrows(); ++row) {
if (!nonum_[row]) {
nonum_[0] = false;
break;
}
}
// set first non-empty label
for (row_type row = 0; row < nrows(); ++row) {
if (label_[row]) {
@ -1058,8 +1056,7 @@ void InsetMathHull::mutate(HullType newtype)
break;
}
}
glueall();
glueall(newtype);
mutate(newtype);
} else { // align & Co.
changeCols(2);

2
src/mathed/InsetMathHull.h
View File

@ -187,7 +187,7 @@ private:
///
void doExtern(Cursor & cur, FuncRequest & func);
///
void glueall();
void glueall(HullType type);
/*!
* split every row at the first relation operator.
* The number of columns must be 1. One column is added.