fix simple text detection

musescore · Oct 24, 2012 · d470cbd · d470cbd
1 parent 763af76
commit d470cbd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -373,6 +373,23 @@ void Text::writeProperties(Xml& xml, bool writeText) const
             }
       }
 
+//---------------------------------------------------------
+//   isSimpleText
+//    check if _doc can be converted to simple text
+//---------------------------------------------------------
+
+bool Text::isSimpleText() const
+      {
+      if (_doc->blockCount() > 1)
+            return false;
+      int n = 0;
+      QTextBlock b(_doc->firstBlock());
+      QTextBlock::iterator i(_doc->firstBlock().begin());
+      for (; !i.atEnd(); ++i)
+            ++n;
+      return n <= 1;
+      }
+
 //---------------------------------------------------------
 //   readProperties
 //---------------------------------------------------------
@@ -477,7 +494,7 @@ bool Text::readProperties(const QDomElement& e)
                   if (_doc == 0)
                         createDoc();
                   _doc->setHtml(s);
-                  if (_doc->blockCount() == 1) {          // simple text?
+                  if (isSimpleText()) {
                         QString s = _doc->toPlainText();
                         delete _doc;
                         _doc = 0;

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -37,6 +37,7 @@ class Text : public SimpleText {
       void createDoc();
       void setUnstyledText(const QString& s);
       void layoutEdit();
+      bool isSimpleText() const;
 
    protected:
       bool _editMode;