[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - embeddedobj/Library_emboleobj.mk embeddedobj/source

[Miklos Vajna]

 embeddedobj/Library_emboleobj.mk          |    1 +
 embeddedobj/source/msole/graphconvert.cxx |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 1353fbe84644d73ae0e5267b48a387063606d0de
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Apr 7 16:51:29 2014 +0200

    fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat()
    
    The primary reason is not performance: on export currently we loose some
    EMF+ properties. While it would be good to fix all those problems one by
    one, this is a small fix to avoid all kind of roundtrip problems in this
    situation.
    
    Change-Id: If5e1c1eabd8290f36b538e374c9707ae17097786
    (cherry picked from commit 2a7fdf2a7bb7345c49c988dfd1fcdb41cebb8a1e)
    Reviewed-on: https://gerrit.libreoffice.org/8903
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 96f03ee..e10110b 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\
 	sal \
 	tl \
 	utl \
+	vcl \
 	$(gb_UWINAPI) \
 ))
 
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 9883c49..1f467ad 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
 #include <tools/stream.hxx>
+#include <vcl/graphicfilter.hxx>
 
 #include "mtnotification.hxx"
 #include "oleembobj.hxx"
@@ -48,6 +49,17 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
     // produces sequence with data in requested format and returns it in aResult
     if ( pBuf )
     {
+        // First, in case the buffer is already in the requested format, then avoid a conversion.
+        SvMemoryStream aMemoryStream(pBuf, nBufSize, STREAM_READ);
+        GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+        sal_uInt16 nRetFormat = 0;
+        if (rFilter.CanImportGraphic(OUString(), aMemoryStream, GRFILTER_FORMAT_DONTKNOW, &nRetFormat) == GRFILTER_OK &&
+                rFilter.GetImportFormatMediaType(nRetFormat) == aMimeType)
+        {
+            aResult <<= uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemoryStream.GetData() ), aMemoryStream.Seek( STREAM_SEEK_TO_END ) );
+            return sal_True;
+        }
+
         uno::Sequence < sal_Int8 > aData( (sal_Int8*)pBuf, nBufSize );
         uno::Reference < io::XInputStream > xIn = new comphelper::SequenceInputStream( aData );
         try