Author: fschmid
Date: Mon May 2 20:50:01 2016
New Revision: 21273
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21273
Log:
Fixed Bug #14016: crash loading file
Modified:
trunk/Scribus/scribus/pageitem_textframe.cpp
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21273&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Mon May 2 20:50:01 2016
@@ -1542,7 +1542,8 @@
//par effect is cleared but is set
dcCharStyleName = clear drop cap char style
{
const QString&
curParent(style.hasParent() ? style.parent() : style.name());
-
charStyle.eraseCharStyle(m_Doc->charStyle(style.peCharStyleName()));
+ if
(m_Doc->charStyles().contains(style.peCharStyleName()))
+
charStyle.eraseCharStyle(m_Doc->charStyle(style.peCharStyleName()));
charStyle.setParent(m_Doc->paragraphStyle(curParent).charStyle().name());
itemText.setCharStyle(a, 1,charStyle);
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
