QTextFormatCollection: replace copy ctor and op= with clear()

operator=, which was only used for clearing, wasn't clearing the hash.
This led to a mismatch between the vector and the hash (given that the hash
points into the vector).

Spotted by interrupting kmail in gdb, and it was in this code
iterating over a 2000 entries hash (the first vector entries not matching
the hash, this code keep appending new entries for the same formats).

This fixes QTBUG-8862 again, the initial fix having been accidentally
reverted in 467b15a.

Change-Id: Ia34b3d002a0199e1930431a4bbdb2ec981ed4ffc
Task-number: QTBUG-8862
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 39fec032dc..36e0a77bd0 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -3371,22 +3371,15 @@ QTextTableCellFormat::QTextTableCellFormat(const QTextFormat &fmt)
 
 // ------------------------------------------------------
 
-
-QTextFormatCollection::QTextFormatCollection(const QTextFormatCollection &rhs)
-{
-    formats = rhs.formats;
-    objFormats = rhs.objFormats;
-}
-
-QTextFormatCollection &QTextFormatCollection::operator=(const QTextFormatCollection &rhs)
+QTextFormatCollection::~QTextFormatCollection()
 {
-    formats = rhs.formats;
-    objFormats = rhs.objFormats;
-    return *this;
 }
 
-QTextFormatCollection::~QTextFormatCollection()
+void QTextFormatCollection::clear()
 {
+    formats.clear();
+    objFormats.clear();
+    hashes.clear();
 }
 
 int QTextFormatCollection::indexForFormat(const QTextFormat &format)