[LyX/master] Don't asssert on (too) deeply nested items

[Juergen Spitzmueller]

commit 44d1756783262ae0af39991e18ec9bcb847fb439
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sat Mar 5 14:17:37 2022 +0100

    Don't asssert on (too) deeply nested items
    
    Use a fallback label instead.
---
 src/BufferParams.cpp |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 95aa913..b1846be 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -633,29 +633,45 @@ bool BufferParams::spellignored(WordLangTuple const & wl) 
const
 
 Bullet & BufferParams::temp_bullet(lyx::size_type const index)
 {
-       LASSERT(index < 4, return pimpl_->temp_bullets[0]);
-       return pimpl_->temp_bullets[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);
 }
 
 
 Bullet const & BufferParams::temp_bullet(lyx::size_type const index) const
 {
-       LASSERT(index < 4, return pimpl_->temp_bullets[0]);
-       return pimpl_->temp_bullets[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 res;
 }
 
 
 Bullet & BufferParams::user_defined_bullet(lyx::size_type const index)
 {
-       LASSERT(index < 4, return pimpl_->temp_bullets[0]);
-       return pimpl_->user_defined_bullets[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);
 }
 
 
 Bullet const & BufferParams::user_defined_bullet(lyx::size_type const index) 
const
 {
-       LASSERT(index < 4, return pimpl_->temp_bullets[0]);
-       return pimpl_->user_defined_bullets[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 res;
 }
 
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs