Fix bug 4232: Crash on bad counter name.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index fc416bae2d18ba756d00d2c51e8a2a266240b8f5..67ca915d105eebeeeb1a10eb332c4049c89c539e 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -28,6 +28,7 @@
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Color.h"
+#include "Layout.h"
 #include "Length.h"
 #include "Font.h"
 #include "LyXRC.h"
@@ -1607,7 +1608,7 @@ docstring const & Paragraph::getLabelstring() const
 // the next two functions are for the manual labels
 docstring const Paragraph::getLabelWidthString() const
 {
-       if (!params().labelWidthString().empty())
+       if (layout()->margintype == MARGIN_MANUAL)
                return params().labelWidthString();
        else
                return _("Senseless with this layout!");
@@ -1657,7 +1658,9 @@ docstring Paragraph::expandLabel(LayoutPtr const & layout,
                size_t const j = fmt.find('@', i + 1);
                if (j != docstring::npos) {
                        docstring parent(fmt, i + 1, j - i - 1);
-                       docstring label = expandLabel(tclass[parent], bparams,
+                       docstring label = from_ascii("XXXX");
+                       if (tclass.hasLayout(parent))
+                               docstring label = expandLabel(tclass[parent], bparams,
                                                      process_appendix);
                        fmt = docstring(fmt, 0, i) + label 
                                + docstring(fmt, j + 1, docstring::npos);
@@ -2394,7 +2397,7 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 }
 
 
-bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
+bool Paragraph::isRTL(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->rightToLeft()