r14483 by jghali - #8676, newline badly handled when saving/opening causing text overflow : update 134 file loader after backport of #8225 fix to 1.3.6svn

scribus-commit scribus-commit at lists.scribus.net
Wed Jan 6 00:45:49 CET 2010


Revision: 14483
Author: jghali
Date: 2010-01-05T10:47:26.131296Z
Commit message: #8676, newline badly handled when saving/opening causing text overflow : update 134 file loader after backport of #8225 fix to 1.3.6svn

Changeset: 
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14482)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14483)
@@ -1075,7 +1075,7 @@
 	// paragraphstyle for trailing chars
 	if (item->itemText.length() == 0 || item->itemText.text(item->itemText.length()-1) != SpecialChars::PARSEP)
 	{
-		putPStyle(docu, item->itemText.paragraphStyle(item->itemText.length()), "para");
+		putPStyle(docu, item->itemText.paragraphStyle(item->itemText.length()), "trail");
 	}
 }
 
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14482)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14483)
@@ -1781,6 +1781,13 @@
 			newItem->itemText.setStyle(newItem->itemText.length()-1, newStyle);
 			newItem->itemText.setCharStyle(newItem->itemText.length()-1, 1, lastStyle->Style);
 		}
+		else if (tName == "trail")
+		{
+			ParagraphStyle newStyle;
+			PrefsManager* prefsManager = PrefsManager::instance();
+			readParagraphStyle(doc, reader, newStyle, prefsManager->appPrefs.fontPrefs.AvailFonts);
+			newItem->itemText.setStyle(newItem->itemText.length(), newStyle);
+		}
 		else if (tName == "tab")
 		{
 			CharStyle newStyle;




More information about the scribus-commit mailing list