vcl/qt5/Qt5Transferable.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3a804b9301cbf68ae583d9f37b0e4e1635e63abe
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Jun 17 18:48:51 2019 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Jun 17 21:30:51 2019 +0200
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.wegh...@posteo.de>
Tested-by: Jenkins
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))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
