Author: jghali
Date: Thu Dec 28 00:18:04 2017
New Revision: 22285
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22285
Log:
#15080: Crash when editing document (round two)
Modified:
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22285&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Dec 28 00:18:04 2017
@@ -2810,7 +2810,9 @@
}
else
{
- doc->currentStyle = currItem->itemText.defaultStyle();
+ const ParagraphStyle& curStyle =
currItem->itemText.defaultStyle();
+ doc->currentStyle.setContext(curStyle.context());
+ doc->currentStyle = curStyle;
emit TextStyle(doc->currentStyle);
// to go: (av)
textPalette->textPal->updateStyle(doc->currentStyle);
@@ -2831,7 +2833,9 @@
setTBvals(currItem);
else
{
- doc->currentStyle = currItem->itemText.defaultStyle();
+ const ParagraphStyle& curStyle =
currItem->itemText.defaultStyle();
+ doc->currentStyle.setContext(curStyle.context());
+ doc->currentStyle = curStyle;
textPalette->textPal->showParStyle(doc->currentStyle.parent());
textPalette->textPal->showCharStyle(doc->currentStyle.charStyle().parent());
emit TextStyle(doc->currentStyle);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
