MCL/sf/mw/qt: comparison src/gui/text/qtextdocument.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include "qtextcontrol_p.h"
 #include "private/qtextedit_p.h"
 #include "qtextdocument_p.h"
 #include <private/qprinter_p.h>
+#include <private/qabstracttextdocumentlayout_p.h>
 #include <limits.h>
 QT_BEGIN_NAMESPACE
 return false;
 }
 /*!
 Converts the plain text string \a plain to a HTML string with
-HTML metacharacters \c{<}, \c{>}, and \c{&} replaced by HTML
+HTML metacharacters \c{<}, \c{>}, \c{&}, and \c{"} replaced by HTML
 entities.
 Example:
 \snippet doc/src/snippets/code/src_gui_text_qtextdocument.cpp 0
 rich += QLatin1String("&lt;");
 else if (plain.at(i) == QLatin1Char('>'))
 rich += QLatin1String("&gt;");
 else if (plain.at(i) == QLatin1Char('&'))
 rich += QLatin1String("&amp;");
+else if (plain.at(i) == QLatin1Char('"'))
+rich += QLatin1String("&quot;");
 else
 rich += plain.at(i);
 }
 return rich;
 }
 */
 /*!
 Returns true if undo is available; otherwise returns false.
+\sa isRedoAvailable(), availableUndoSteps()
 */
 bool QTextDocument::isUndoAvailable() const
 {
 Q_D(const QTextDocument);
 return d->isUndoAvailable();
 }
 /*!
 Returns true if redo is available; otherwise returns false.
+\sa isUndoAvailable(), availableRedoSteps()
 */
 bool QTextDocument::isRedoAvailable() const
 {
 Q_D(const QTextDocument);
 return d->isRedoAvailable();
 }
+/*! \since 4.6
+Returns the number of available undo steps.
+\sa isUndoAvailable()
+*/
+int QTextDocument::availableUndoSteps() const
+{
+Q_D(const QTextDocument);
+return d->availableUndoSteps();
+}
+/*! \since 4.6
+Returns the number of available redo steps.
+\sa isRedoAvailable()
+*/
+int QTextDocument::availableRedoSteps() const
+{
+Q_D(const QTextDocument);
+return d->availableRedoSteps();
+}
 /*! \since 4.4
 Returns the document's revision (if undo is enabled).
 }
 QAbstractTextDocumentLayout *layout = doc->documentLayout();
 layout->setPaintDevice(p.device());
+// copy the custom object handlers
+layout->d_func()->handlers = documentLayout()->d_func()->handlers;
 int dpiy = p.device()->logicalDpiY();
 int margin = 0;
 if (printer->fullPage() && !printer->d_func()->hasCustomPageMargins) {
 // for compatibility
 margin = (int) ((2/2.54)*dpiy); // 2 cm margins
 toPage = doc->pageCount();
 }
 // paranoia check
 fromPage = qMax(1, fromPage);
 toPage = qMin(doc->pageCount(), toPage);
+if (toPage < fromPage) {
+// if the user entered a page range outside the actual number
+// of printable pages, just return
+return;
+}
 if (printer->pageOrder() == QPrinter::LastPageFirst) {
 int tmp = fromPage;
 fromPage = toPage;
 toPage = tmp;
 void QTextHtmlExporter::emitAttribute(const char *attribute, const QString &value)
 {
 html += QLatin1Char(' ');
 html += QLatin1String(attribute);
 html += QLatin1String("=\"");
-html += value;
+html += Qt::escape(value);
 html += QLatin1Char('"');
 }
 bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
 {
 void QTextHtmlExporter::emitFontFamily(const QString &family)
 {
 html += QLatin1String(" font-family:");
-QLatin1Char quote('\'');
+QLatin1String quote("\'");
-if (family.contains(quote))
+if (family.contains(QLatin1Char('\'')))
-quote = QLatin1Char('\"');
+quote = QLatin1String("&quot;");
 html += quote;
-html += family;
+html += Qt::escape(family);
 html += quote;
 html += QLatin1Char(';');
 }
 void QTextHtmlExporter::emitMargins(const QString &top, const QString &bottom, const QString &left, const QString &right)
 if (format.isAnchor()) {
 const QString name = format.anchorName();
 if (!name.isEmpty()) {
 html += QLatin1String("<a name=\"");
-html += name;
+html += Qt::escape(name);
 html += QLatin1String("\"></a>");
 }
 const QString href = format.anchorHref();
 if (!href.isEmpty()) {
 html += QLatin1String("<a href=\"");
-html += href;
+html += Qt::escape(href);
 html += QLatin1String("\">");
 closeAnchor = true;
 }
 }

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7