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

Rename InsetMathHull::isTable to allowsTabularFeatures

Browse Source 
The old name conflicted with the newly introduced Inset::isTable.

Now the meaning is as follows.
* Inset::isTable() is true when the inset is composed of lines and columns
* InsetMathHull::allowsTabularFeatures is true when the current type of hull allows for tabular-like functions.

(cherry picked from commit db39dc7ccd4c2dd14ef20547e6e3c056ba030d83)
This commit is contained in:
Jean-Marc Lasgouttes 2016-04-22 15:50:51 +02:00
parent 1f2d7bf7e6
commit 7444b894f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mathed/InsetMathHull.cpp
View File

@ -1095,7 +1095,7 @@ void InsetMathHull::footer_write(WriteStream & os) const
} }
bool InsetMathHull::isTable() const bool InsetMathHull::allowsTabularFeatures() const
{ {
switch (type_) { switch (type_) {
case hullEqnArray: case hullEqnArray:
@ -1857,7 +1857,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
} }
case LFUN_TABULAR_FEATURE: case LFUN_TABULAR_FEATURE:
if (!isTable()) if (!allowsTabularFeatures())
cur.undispatched(); cur.undispatched();
else else
InsetMathGrid::doDispatch(cur, cmd); InsetMathGrid::doDispatch(cur, cmd);
@ -1978,7 +1978,7 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
return InsetMathGrid::getStatus(cur, cmd, status); return InsetMathGrid::getStatus(cur, cmd, status);
case LFUN_TABULAR_FEATURE: { case LFUN_TABULAR_FEATURE: {
if (!isTable()) if (!allowsTabularFeatures())
return false; return false;
string s = cmd.getArg(0); string s = cmd.getArg(0);
if (!rowChangeOK() if (!rowChangeOK()

2
src/mathed/InsetMathHull.h
View File

@ -241,7 +241,7 @@ private:
/// consistency check /// consistency check
void check() const; void check() const;
/// does it understand tabular-feature commands? /// does it understand tabular-feature commands?
bool isTable() const; bool allowsTabularFeatures() const;
/// can this change its number of rows? /// can this change its number of rows?
bool rowChangeOK() const; bool rowChangeOK() const;
/// can this change its number of cols? /// can this change its number of cols?