diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-05-05 16:52:04 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-05-07 08:07:42 +0200 |
commit | 671ffc8f7360b03cbb4475caee8434069f941cc6 (patch) | |
tree | 82b703c27a14229e397646feb64c85302eaf1b15 /src/plugins/texteditor | |
parent | ee3d6eba0587c4ab78210f7ca2f81c8406a23c4c (diff) | |
download | qt-creator-671ffc8f7360b03cbb4475caee8434069f941cc6.tar.gz |
Fix a warning about a position out of range.
May happen when selecting a text in diff editor.
Change-Id: I2c4790c42c91623fc8b4cabef8a4604de9fd4cef
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/texteditor')
-rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 345d3d105e..67b808dcb6 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -5639,10 +5639,10 @@ QMimeData *BaseTextEditorWidget::createMimeDataFromSelection() const foreach (const QTextLayout::FormatRange &range, layout->additionalFormats()) { const int startPosition = current.position() + range.start - selectionStart - removedCount; const int endPosition = startPosition + range.length; - if (endPosition <= 0 || startPosition >= endOfDocument) + if (endPosition <= 0 || startPosition >= endOfDocument - removedCount) continue; tempCursor.setPosition(qMax(startPosition, 0)); - tempCursor.setPosition(qMin(endPosition, endOfDocument), QTextCursor::KeepAnchor); + tempCursor.setPosition(qMin(endPosition, endOfDocument - removedCount), QTextCursor::KeepAnchor); tempCursor.setCharFormat(range.format); } } else { |