diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-17 18:48:51 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-17 21:30:51 +0200 |
| commit | 3a804b9301cbf68ae583d9f37b0e4e1635e63abe (patch) | |
| tree | 42cbc499570848d74f8ec12bc8645590510699c9 | |
| parent | df878758fc8abb13dd9e97f2619f400a28d99d66 (diff) | |
tdf#125968 fix the result order of text mime info
lcl_textMimeInfo returns three booleans when decoding the text
mime string in the order: NoCharset / locale encoded, UTF16,
and UTF8.
Change-Id: I3cc4090e9874125ed68ec953d7d72889dead269b
Reviewed-on: https://gerrit.libreoffice.org/74183
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
| -rw-r--r-- | vcl/qt5/Qt5Transferable.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx index 65e2ad5399fc..79e524d71eae 100644 --- a/vcl/qt5/Qt5Transferable.cxx +++ b/vcl/qt5/Qt5Transferable.cxx @@ -284,8 +284,8 @@ QVariant Qt5MimeData::retrieveData(const QString& mimeType, QVariant::Type) cons aFlavor.MimeType = toOUString(mimeType); aFlavor.DataType = cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(); - bool bWantNoCharset = false, bWantUTF8 = false, bWantUTF16 = false; - if (lcl_textMimeInfo(aFlavor.MimeType, bWantNoCharset, bWantUTF8, bWantUTF16)) + bool bWantNoCharset = false, bWantUTF16 = false, bWantUTF8 = false; + if (lcl_textMimeInfo(aFlavor.MimeType, bWantNoCharset, bWantUTF16, bWantUTF8)) { if ((bWantNoCharset && !m_bHaveNoCharset) || (bWantUTF8 && !m_bHaveUTF8)) { |