diff options
| author | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-04 23:06:22 +0000 |
|---|---|---|
| committer | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-04 23:06:22 +0000 |
| commit | f9ea35cd2131feb62f6157f79c4d453cf0307d94 (patch) | |
| tree | 335d58c319ced927bd982291ca46913ae70179a1 /scribus/chartableview.cpp | |
| parent | b4bb54811720a94c8b31370c04b61ac51f66d120 (diff) | |
| download | scribus-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/chartableview.cpp')
| -rw-r--r-- | scribus/chartableview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scribus/chartableview.cpp b/scribus/chartableview.cpp index bbc16eb..94497bf 100644 --- a/scribus/chartableview.cpp +++ b/scribus/chartableview.cpp @@ -77,7 +77,7 @@ void CharTableView::mousePressEvent(QMouseEvent* e) int index = currenCharactersIndex(); int currentChar = -1; - if (index < model()->characters().count()) + if ((index < model()->characters().count()) && (model()->characters().count() > 0)) currentChar = model()->characters()[index]; if (e->button() == Qt::RightButton && currentChar > -1) @@ -117,7 +117,7 @@ void CharTableView::mouseReleaseEvent(QMouseEvent* e) void CharTableView::viewDoubleClicked(const QModelIndex & /*index*/) { if (model()->characters().count() > currenCharactersIndex()) - emit selectChar(model()->characters()[currenCharactersIndex()]); + emit selectChar(model()->characters()[currenCharactersIndex()], model()->fonts()[currenCharactersIndex()]); } int CharTableView::currenCharactersIndex() |