Fix bug 4037 and related problems. The patch has been cleaned up a bit

[features.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 69eef18615c3fec8c5a43a5ef50dcdbdc669dc18..9d122678ff5d884cd6cb5ed5a616ad8f250bf6db 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1709,6 +1709,7 @@ int TextMetrics::leftMargin(int max_width,
                        if (pars[newpar].layout()->isEnvironment()) {
                                l_margin = leftMargin(max_width, newpar);
                        }
+                       //FIXME Should this check for emptyLayout() as well?
                        if (par.layout() == tclass.defaultLayout()) {
                                if (pars[newpar].params().noindent())
                                        parindent.erase();
@@ -1830,7 +1831,7 @@ int TextMetrics::leftMargin(int max_width,
            && !(!par.empty()
                    && par.isInset(pos)
                    && par.getInset(pos)->display())
-           && (par.layout() != tclass.defaultLayout()
+           && (par.layout() != tclass.defaultLayout() //should this check emptyLayout()?
                || buffer.params().paragraph_separation ==
                   BufferParams::PARSEP_INDENT))
        {