Author: jghali Date: Sun Feb 18 14:40:57 2018 New Revision: 22399 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22399 Log: improve #15149 fix by handling other breaks and SpecialChars::OBJECT which could also break document XML
Modified: trunk/Scribus/scribus/ui/bookmwin.cpp Modified: trunk/Scribus/scribus/ui/bookmwin.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22399&path=/trunk/Scribus/scribus/ui/bookmwin.cpp ============================================================================== --- trunk/Scribus/scribus/ui/bookmwin.cpp (original) +++ trunk/Scribus/scribus/ui/bookmwin.cpp Sun Feb 18 14:40:57 2018 @@ -149,9 +149,10 @@ const StoryText& itemText = item->itemText; for (int i = 0; i < item->itemText.length(); ++i) { - str = item->itemText.text(i); - if ((str == SpecialChars::PARSEP) || (str == SpecialChars::LINEBREAK) || (str == QChar(10))) + ch = item->itemText.text(i); + if (SpecialChars::isBreak(ch) || (ch == QChar(10))) break; + str = QString(ch); if (item->itemText.hasExpansionPoint(i)) { str = item->expand(item->itemText.expansionPoint(i)); @@ -161,7 +162,7 @@ for (int j = 0; j < str.length(); ++j) { ch = str.at(j); - if (ch == SpecialChars::OLD_NBSPACE) + if (ch == SpecialChars::OLD_NBSPACE || ch == SpecialChars::OBJECT) ch = ' '; if ((ch == '(') || (ch == ')') || (ch == '\\')) title += "\\"; _______________________________________________ scribus-commit mailing list scribus-commit@lists.scribus.net http://lists.scribus.net/mailman/listinfo/scribus-commit