Fixed Bug 10336: "Inserted glyph is not of the requested font" by backporting the relevant changes from 1.5.0svn

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17279 11d20701-8431-0410-a711-e3c959e3b870

1 files changed, 5 insertions, 0 deletions

diff --git a/scribus/chartablemodel.h b/scribus/chartablemodel.h
index 5dcd403..a4bae05 100644
--- a/scribus/chartablemodel.h
+++ b/scribus/chartablemodel.h
@@ -8,6 +8,7 @@ for which a new license (GPL+exception) is in place.
 #define CHARTABLEMODEL_H
 
 #include <QAbstractTableModel>
+#include <QStringList>
 
 #include "scribusapi.h"
 
@@ -44,9 +45,12 @@ public:
 	ScFace fontFace();
 
 	void setCharacters(CharClassDef ch);
+	void setCharactersAndFonts(CharClassDef ch, QStringList fonts);
+	void addCharacter(QString ch);
 	CharClassDef characters() {
 		return m_characters;
 	};
+	QStringList fonts() { return m_fonts; }
 
 	//! \brief called to erase glyph at index from table.
 	bool removeCharacter(int index);
@@ -84,6 +88,7 @@ private:
 
 	QString m_fontInUse;
 	CharClassDef m_characters;
+	QStringList m_fonts;
 
 	//! \brief Internal selection handling. See selectionChanged().
 	QItemSelectionModel * m_selectionModel;