[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - embeddedobj/source

Andras Timar andras.timar at collabora.com
Thu Apr 10 01:50:43 PDT 2014


 embeddedobj/source/msole/graphconvert.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e82c7876a5c66afe5694c92ac6f05857c7ba2d1
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 10 01:50:53 2014 -0700

    build fix
    
    Change-Id: I9b4e4f3fc60ee84e3c180360cc452ab1d9592acd

diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 006073c..b6512b6 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
         GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
         sal_uInt16 nRetFormat = 0;
         if (rFilter.CanImportGraphic(OUString(), aMemoryStream, GRFILTER_FORMAT_DONTKNOW, &nRetFormat) == GRFILTER_OK &&
-                rFilter.GetImportFormatMediaType(nRetFormat) == aMimeType)
+                rFilter.GetImportFormatMediaType(nRetFormat) == String(aMimeType))
         {
             aResult <<= uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemoryStream.GetData() ), aMemoryStream.Seek( STREAM_SEEK_TO_END ) );
             return sal_True;


More information about the Libreoffice-commits mailing list