summaryrefslogtreecommitdiffstats
path: root/scribus/charselectenhanced.h
diff options
context:
space:
mode:
authorfschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870>2012-02-04 23:06:22 +0000
committerfschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870>2012-02-04 23:06:22 +0000
commitf9ea35cd2131feb62f6157f79c4d453cf0307d94 (patch)
tree335d58c319ced927bd982291ca46913ae70179a1 /scribus/charselectenhanced.h
parentb4bb54811720a94c8b31370c04b61ac51f66d120 (diff)
downloadscribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.tar.gz
scribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.tar.xz
scribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.zip
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
Diffstat (limited to 'scribus/charselectenhanced.h')
-rw-r--r--scribus/charselectenhanced.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/scribus/charselectenhanced.h b/scribus/charselectenhanced.h
index bb5d36e..60862fb 100644
--- a/scribus/charselectenhanced.h
+++ b/scribus/charselectenhanced.h
@@ -26,6 +26,7 @@ public:
~CharSelectEnhanced();
void setDoc(ScribusDoc* doc);
+ QString getUsedFont();
signals:
/*! \brief A signall emitted when press the "Insert" button.
@@ -34,7 +35,7 @@ signals:
void insertSpecialChars(const QString & chars);
public slots:
- void newChar(uint i);
+ void newChar(uint i, QString);
void delChar();
void newFont(int font);
void newCharClass(int c);