[Libreoffice-commits] core.git: vcl/qt5

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Jan 26 10:46:31 UTC 2019


 vcl/qt5/Qt5Clipboard.cxx |   30 ------------------------------
 1 file changed, 30 deletions(-)

New commits:
commit c8b0c382c6330865df50ae7cf7360c8a2c08ebe6
Author:     Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Mon Jan 21 15:15:22 2019 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jan 26 11:46:11 2019 +0100

    tdf#120836 KDE5: Clipboard: don't put images to clipboard
    
    Image generation is very slow.
    
    Change-Id: I34d45ed1f4d665613700f01cceec59069b091a79
    Reviewed-on: https://gerrit.libreoffice.org/66680
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 7407e2b062b0..92bb3a89da3d 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -277,36 +277,6 @@ void VclQt5Clipboard::setContents(
             }
         }
 
-        // Add image data if present
-        if (bHasImage)
-        {
-            css::datatransfer::DataFlavor aFlavor;
-            //FIXME: other image formats?
-            aFlavor.MimeType = "image/png";
-            aFlavor.DataType = cppu::UnoType<Sequence<sal_Int8>>::get();
-
-            Any aValue;
-            try
-            {
-                aValue = xTrans->getTransferData(aFlavor);
-            }
-            catch (...)
-            {
-            }
-
-            if (aValue.getValueType() == cppu::UnoType<Sequence<sal_Int8>>::get())
-            {
-                Sequence<sal_Int8> aData;
-                aValue >>= aData;
-
-                QImage image;
-                image.loadFromData(reinterpret_cast<const uchar*>(aData.getConstArray()),
-                                   aData.getLength());
-
-                pMimeData->setImageData(image);
-            }
-        }
-
         // Add text data
         // TODO: consider checking if text of suitable type is present
         {


More information about the Libreoffice-commits mailing list