Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove ODF format support leftovers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-08-29 15:39:45 +03:00
parent 8619b09ff1
commit 7e8029a522
2 changed files with 2 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/text/qtextcontrol.cpp
View file

@ -2840,13 +2840,8 @@ void QUnicodeControlCharacterMenu::menuActionTriggered()
QStringList QTextEditMimeData::formats() const QStringList QTextEditMimeData::formats() const
{ {
if (!fragment.isEmpty()) if (!fragment.isEmpty())
return QStringList() << QString::fromLatin1("text/plain") << QString::fromLatin1("text/html") return QStringList() << QString::fromLatin1("text/plain") << QString::fromLatin1("text/html");
#ifndef QT_NO_TEXTODFWRITER return QMimeData::formats();
<< QString::fromLatin1("application/vnd.oasis.opendocument.text")
#endif
;
else
return QMimeData::formats();
} }
QVariant QTextEditMimeData::retrieveData(const QString &mimeType, QVariant::Type type) const QVariant QTextEditMimeData::retrieveData(const QString &mimeType, QVariant::Type type) const
@ -2861,15 +2856,6 @@ void QTextEditMimeData::setup() const
QTextEditMimeData *that = const_cast<QTextEditMimeData *>(this); QTextEditMimeData *that = const_cast<QTextEditMimeData *>(this);
#ifndef QT_NO_TEXTHTMLPARSER #ifndef QT_NO_TEXTHTMLPARSER
that->setData(QLatin1String("text/html"), fragment.toHtml("utf-8").toUtf8()); that->setData(QLatin1String("text/html"), fragment.toHtml("utf-8").toUtf8());
#endif
#ifndef QT_NO_TEXTODFWRITER
{
QBuffer buffer;
QTextDocumentWriter writer(&buffer, "ODF");
writer.write(fragment);
buffer.close();
that->setData(QLatin1String("application/vnd.oasis.opendocument.text"), buffer.data());
}
#endif #endif
that->setText(fragment.toPlainText()); that->setText(fragment.toPlainText());
fragment = QTextDocumentFragment(); fragment = QTextDocumentFragment();

62
tests/benchmarks/gui/text/qtext/main.cpp
View file

@ -49,10 +49,6 @@ private slots:
void shaping_data(); void shaping_data();
void shaping(); void shaping();
void odfWriting_empty();
void odfWriting_text();
void odfWriting_images();
void constructControl(); void constructControl();
void constructDocument(); void constructDocument();
@ -145,64 +141,6 @@ void tst_QText::shaping()
} }
} }
void tst_QText::odfWriting_empty()
{
QVERIFY(QTextDocumentWriter::supportedDocumentFormats().contains("ODF")); // odf compiled in
QTextDocument *doc = new QTextDocument();
// write it
QBENCHMARK {
QBuffer buffer;
buffer.open(QIODevice::WriteOnly);
QTextDocumentWriter writer(&buffer, "ODF");
writer.write(doc);
}
delete doc;
}
void tst_QText::odfWriting_text()
{
QTextDocument *doc = new QTextDocument();
QTextCursor cursor(doc);
QTextBlockFormat bf;
bf.setIndent(2);
cursor.insertBlock(bf);
cursor.insertText(m_lorem);
bf.setTopMargin(10);
cursor.insertBlock(bf);
cursor.insertText(m_lorem);
bf.setRightMargin(30);
cursor.insertBlock(bf);
cursor.insertText(m_lorem);
// write it
QBENCHMARK {
QBuffer buffer;
buffer.open(QIODevice::WriteOnly);
QTextDocumentWriter writer(&buffer, "ODF");
writer.write(doc);
}
delete doc;
}
void tst_QText::odfWriting_images()
{
QTextDocument *doc = new QTextDocument();
QTextCursor cursor(doc);
cursor.insertText(m_lorem);
QImage image(400, 200, QImage::Format_ARGB32_Premultiplied);
cursor.insertImage(image);
cursor.insertText(m_lorem);
// write it
QBENCHMARK {
QBuffer buffer;
buffer.open(QIODevice::WriteOnly);
QTextDocumentWriter writer(&buffer, "ODF");
writer.write(doc);
}
delete doc;
}
QSize tst_QText::setupTextLayout(QTextLayout *layout, bool wrap, int wrapWidth) QSize tst_QText::setupTextLayout(QTextLayout *layout, bool wrap, int wrapWidth)
{ {
layout->setCacheEnabled(true); layout->setCacheEnabled(true);