r20423 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Fri Sep 25 23:47:20 UTC 2015
Author: jghali
Date: Fri Sep 25 23:47:19 2015
New Revision: 20423
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20423
Log:
#13369: Multiple Duplicate of text box loses style
Modified:
branches/Version14x/Scribus/scribus/scribusXml.cpp
Modified: branches/Version14x/Scribus/scribus/scribusXml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20423&path=/branches/Version14x/Scribus/scribus/scribusXml.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusXml.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusXml.cpp Fri Sep 25 23:47:19 2015
@@ -2352,6 +2352,8 @@
void ScriXmlDoc::WriteLegacyCStyle (ScXmlStreamWriter& writer, const CharStyle& style)
{
+ if ( ! style.parent().isEmpty() )
+ writer.writeAttribute("CPARENT", style.parent());
if ( ! style.isInhFont())
writer.writeAttribute("CFONT", style.font().scName());
if ( ! style.isInhFontSize())
@@ -2504,6 +2506,9 @@
void ScriXmlDoc::ReadLegacyCStyle (const QXmlStreamAttributes& attrs, CharStyle& newStyle, ScribusDoc* doc)
{
+ if (attrHasValue(attrs, "CPARENT"))
+ newStyle.setParent(attrAsString(attrs, "CPARENT", ""));
+
bool hasFont = attrHasValue(attrs, "CFONT");
QString tmpf = attrAsString(attrs, "CFONT", doc->toolSettings.defFont);
bool unknown = false;
More information about the scribus-commit
mailing list