#i107449#: GraphicProvider uses different mime type names for wmf etc.

2 files changed, 17 insertions, 11 deletions

diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 31908dd623..1e2d0208df 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -41,8 +41,10 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <tools/link.hxx>
 #include <vos/mutex.hxx>
-#include <unotools/streamhelper.hxx>
+#include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/seqstream.hxx>
+#include <tools/stream.hxx>
 
 #include "mtnotification.hxx"
 #include "oleembobj.hxx"
@@ -59,12 +61,11 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
     // produces sequence with data in requested format and returns it in aResult
     if ( pBuf )
     {
-        SvMemoryStream aBufStream( pBuf, nBufSize, STREAM_READ );
-        aBufStream.ObjectOwnsMemory( sal_False );
-        uno::Reference < io::XInputStream > xIn = new utl::OInputStreamHelper( aBufStream.GetLockBytes(), nBufSize );
+        uno::Sequence < sal_Int8 > aData( (sal_Int8*)pBuf, nBufSize );
+        uno::Reference < io::XInputStream > xIn = new comphelper::SequenceInputStream( aData );
         try
         {
-            uno::Reference < graphic::XGraphicProvider > xGraphicProvider( comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.graphics.GraphicProvider") ), uno::UNO_QUERY );
+            uno::Reference < graphic::XGraphicProvider > xGraphicProvider( comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.graphic.GraphicProvider") ), uno::UNO_QUERY );
             if( xGraphicProvider.is() )
             {
                 uno::Sequence< beans::PropertyValue > aMediaProperties( 1 );
@@ -74,12 +75,13 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
                 if( xGraphic.is() )
                 {
                     SvMemoryStream aNewStream( 65535, 65535 );
-                    uno::Reference < io::XOutputStream > xOut = new utl::OOutputStreamHelper( aNewStream.GetLockBytes() );
+//					uno::Reference < io::XOutputStream > xOut = new utl::OOutputStreamHelper( aNewStream.GetLockBytes() );
+                    uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream );				
                     uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 );
-                    aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
-                    aMediaProperties[0].Value <<= xOut;
-                    aMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
-                    aMediaProperties[0].Value <<= aMimeType;
+                    aOutMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+                    aOutMediaProperties[0].Value <<= xOut;
+                    aOutMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
+                    aOutMediaProperties[1].Value <<= aMimeType;
 
                     xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
                     aResult <<= uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aNewStream.GetData() ), aNewStream.Seek( STREAM_SEEK_TO_END ) );
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e6c254f058..7e32d35f56 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -299,9 +299,11 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
 
         unsigned char* pBuf = NULL;
         sal_uInt32 nBufSize = 0;
+        ::rtl::OUString aFormat;
 
         if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-wmf");
             METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict );
             if ( pMF )
             {
@@ -332,6 +334,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-emf");
             nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) )
@@ -345,6 +348,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_GDI ) // Bitmap
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-MS-bmp");
             nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) )
@@ -364,7 +368,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
                   && aFlavor.DataType == m_aSupportedGraphFormats[nInd].DataType
                   && aFlavor.DataType == getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) )
             {
-                bAnyIsReady = ConvertBufferToFormat( ( void* )pBuf, nBufSize, m_aSupportedGraphFormats[nInd].MimeType, aResult );
+                bAnyIsReady = ConvertBufferToFormat( ( void* )pBuf, nBufSize, aFormat, aResult );
                 break;
             }
         }