[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Tor Lillqvist (via logerrit)]

 sc/source/ui/view/viewfun5.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c45acdcdd022a17559b9f7b85790c656a1599339
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 13 13:30:43 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 6 07:18:55 2019 +0100

    tdf#128466: Accept also JPEG
    
    Change-Id: If8499cde875e03cb6c56259badd64ba6aee08a66
    Reviewed-on: https://gerrit.libreoffice.org/82584
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 7dba640b5691c22d6529e53752255fddc2b461e6)
    Reviewed-on: https://gerrit.libreoffice.org/82618
    Tested-by: Jenkins
    (cherry picked from commit 3adb591bc632854dc9f0af0c8498ae45171080a7)
    Reviewed-on: https://gerrit.libreoffice.org/84524

diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index cdac007fc8df..0e61a2a8a072 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -482,7 +482,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
             }
         }
     }
-    else if (nFormatId == SotClipboardFormatId::BITMAP || nFormatId == SotClipboardFormatId::PNG)
+    else if (nFormatId == SotClipboardFormatId::BITMAP || nFormatId == SotClipboardFormatId::PNG || nFormatId == SotClipboardFormatId::JPEG)
     {
         BitmapEx aBmpEx;
         if( aDataHelper.GetBitmapEx( SotClipboardFormatId::BITMAP, aBmpEx ) )