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

Revert "Don't asssert on (too) deeply nested items"

Browse Source 
This reverts commit 44d1756783.
This commit is contained in:
Juergen Spitzmueller 2022-03-06 09:48:39 +01:00
parent 44d1756783
commit b296941d90
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/BufferParams.cpp
View File

@ -633,45 +633,29 @@ bool BufferParams::spellignored(WordLangTuple const & wl) const
Bullet & BufferParams::temp_bullet(lyx::size_type const index)
{
if (index < 4)
return pimpl_->temp_bullets[index];
// Fallback bullet if we are too deeply nested
docstring const fb = from_ascii("?") + convert<docstring>(index + 1);
Bullet const & res = Bullet(fb);
return const_cast<Bullet&>(res);
LASSERT(index < 4, return pimpl_->temp_bullets[0]);
return pimpl_->temp_bullets[index];
}
Bullet const & BufferParams::temp_bullet(lyx::size_type const index) const
{
if (index < 4)
return pimpl_->temp_bullets[index];
// Fallback bullet if we are too deeply nested
docstring const fb = from_ascii("?") + convert<docstring>(index + 1);
Bullet const & res = Bullet(fb);
return res;
LASSERT(index < 4, return pimpl_->temp_bullets[0]);
return pimpl_->temp_bullets[index];
}
Bullet & BufferParams::user_defined_bullet(lyx::size_type const index)
{
if (index < 4)
return pimpl_->user_defined_bullets[index];
// Fallback bullet if we are too deeply nested
docstring const fb = from_ascii("?") + convert<docstring>(index + 1);
Bullet const & res = Bullet(fb);
return const_cast<Bullet&>(res);
LASSERT(index < 4, return pimpl_->temp_bullets[0]);
return pimpl_->user_defined_bullets[index];
}
Bullet const & BufferParams::user_defined_bullet(lyx::size_type const index) const
{
if (index < 4)
return pimpl_->user_defined_bullets[index];
// Fallback bullet if we are too deeply nested
docstring const fb = from_ascii("?") + convert<docstring>(index + 1);
Bullet const & res = Bullet(fb);
return res;
LASSERT(index < 4, return pimpl_->temp_bullets[0]);
return pimpl_->user_defined_bullets[index];
}