equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
8 ** |
8 ** |
3083 QTextFormat &f = formats.last(); |
3083 QTextFormat &f = formats.last(); |
3084 if (!f.d) |
3084 if (!f.d) |
3085 f.d = new QTextFormatPrivate; |
3085 f.d = new QTextFormatPrivate; |
3086 f.d->resolveFont(defaultFnt); |
3086 f.d->resolveFont(defaultFnt); |
3087 |
3087 |
3088 hashes.insert(hash, idx); |
3088 if (!hashes.contains(hash, idx)) |
|
3089 hashes.insert(hash, idx); |
3089 |
3090 |
3090 } QT_CATCH(...) { |
3091 } QT_CATCH(...) { |
3091 formats.pop_back(); |
3092 formats.pop_back(); |
3092 QT_RETHROW; |
3093 QT_RETHROW; |
3093 } |
3094 } |