[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Calligra/text-layoutrestructure-boemann] bd0ffe3: Fix crash on
From:       Sebastian Sauer <sebastian.sauer () kdab ! com>
Date:       2011-01-05 19:58:00
Message-ID: 20110105195800.D7A4DA6090 () git ! kde ! org
[Download RAW message or body]

commit bd0ffe3b197cab868d513ea7d48d4b53686c806f
branch text-layoutrestructure-boemann
Author: Sebastian Sauer <sebastian.sauer@kdab.com>
Date:   Wed Jan 5 20:56:13 2011 +0100

    Fix crash on lloading the document attached to KDE bug #244411 . We always need \
to set the line-width to >=0.0 else that QTextLine will be removed later leaving \
things in an inconsistent state.  
    backtrace was;
    [KCrash Handler]

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d58e152..595d588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,8 @@ ELSE(TINY)
     set(SHOULD_BUILD_KPRESENTER TRUE)
     set(SHOULD_BUILD_TABLES TRUE)
     set(SHOULD_BUILD_KARBON TRUE)
-    set(SHOULD_BUILD_KRITA TRUE)
-    set(SHOULD_BUILD_KEXI TRUE)
+    set(SHOULD_BUILD_KRITA FALSE)
+    set(SHOULD_BUILD_KEXI FALSE)
     set(SHOULD_BUILD_FLOW TRUE)
     set(SHOULD_BUILD_KPLATO TRUE)
     set(SHOULD_BUILD_KFORMULA TRUE)
diff --git a/plugins/textshape/TextLine.cpp b/plugins/textshape/TextLine.cpp
index 972917c..ded8a88 100644
--- a/plugins/textshape/TextLine.cpp
+++ b/plugins/textshape/TextLine.cpp
@@ -73,6 +73,7 @@ void TextLine::fit(const bool resetHorizontalPosition)
         if (m_state->layout->lineCount() > 1 || m_state->layout->text().length() > \
0)  line.setNumColumns(1);
         line.setPosition(QPointF(m_state->x(), m_state->y()));
+        line.setLineWidth(0.0);
         return;
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]