[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Transferable.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60d83e5d5490bb488e26f52d5aeee667ffd206fd
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Jun 18 16:26:28 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Jun 18 23:29:13 2019 +0200

    Qt5 initialize bool before lcl_textMimeInfo call
    
    Change-Id: Ie1b2e77145c4f84dc7d2c1edd214363b7fa0625e
    Reviewed-on: https://gerrit.libreoffice.org/74294
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 288e729ecfdb7dbb9a4ca00cbc03bcdfe9442a0d)
    Reviewed-on: https://gerrit.libreoffice.org/74303

diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx
index 79e524d71eae..10a139093041 100644
--- a/vcl/qt5/Qt5Transferable.cxx
+++ b/vcl/qt5/Qt5Transferable.cxx
@@ -79,7 +79,7 @@ css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL Qt5Transferable::getT
             continue;
 
         // LO doesn't like 'text/plain', so we have to provide UTF-16
-        bool bIsNoCharset = false, bIsUTF8 = false, bIsUTF16 = false;
+        bool bIsNoCharset = false, bIsUTF16 = false, bIsUTF8 = false;
         if (lcl_textMimeInfo(toOUString(rMimeType), bIsNoCharset, bIsUTF16, bIsUTF8))
         {
             bHaveNoCharset |= bIsNoCharset;
@@ -252,7 +252,7 @@ QStringList Qt5MimeData::formats() const
     css::uno::Sequence<css::datatransfer::DataFlavor> aFormats
         = m_aContents->getTransferDataFlavors();
     QStringList aList;
-    bool bHaveUTF16;
+    bool bHaveUTF16 = false;
 
     for (const auto& rFlavor : aFormats)
     {