diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f37eb65307a3..f950b6597d1c 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1576,7 +1576,14 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat // SV internal filters for import bitmaps and MetaFiles ReadGraphic( rIStream, rGraphic ); if( rIStream.GetError() ) + { nStatus = GRFILTER_FORMATERROR; + } + else + { + // #i15508# added BMP type (checked, works) + eLinkType = GFX_LINK_TYPE_NATIVE_BMP; + } } else if( aFilterName.equalsIgnoreAsciiCase( IMP_MOV ) ) { diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 742b5537e109..1d726bae9dd5 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -203,6 +203,10 @@ bool GfxLink::LoadNative( Graphic& rGraphic ) switch( meType ) { case( GFX_LINK_TYPE_NATIVE_GIF ): nCvtType = CVT_GIF; break; + + // #i15508# added BMP type for better exports (reload when swapped - checked, works) + case( GFX_LINK_TYPE_NATIVE_BMP ): nCvtType = CVT_BMP; break; + case( GFX_LINK_TYPE_NATIVE_JPG ): nCvtType = CVT_JPG; break; case( GFX_LINK_TYPE_NATIVE_PNG ): nCvtType = CVT_PNG; break; case( GFX_LINK_TYPE_NATIVE_TIF ): nCvtType = CVT_TIF; break; |