diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-05-19 11:50:38 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2014-05-19 11:50:38 +0000 |
| commit | a5cfb91f3dc4b38055fb920f65101cc45d52f8de (patch) | |
| tree | 66a6ada20d1e3910b10990db76353daf55b6e8ed /svtools | |
| parent | a90c007908eb3f66e28a9ea525729065db652b6f (diff) | |
124717: do not mark *.svm graphic files as *.bmp graphic files
Notes
Notes:
merged as: 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/filter.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 7b474884d1e2..71f3f90f29e7 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1630,8 +1630,8 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, if( !ImportXPM( rIStream, rGraphic ) ) nStatus = GRFILTER_FILTERERROR; } - else if( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) || - aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) ) + else if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) + || aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) ) { // SV interne Importfilter fuer Bitmaps und MetaFiles rIStream >> rGraphic; @@ -1642,8 +1642,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, } else { - // #15508# added BMP type (checked, works) - eLinkType = GFX_LINK_TYPE_NATIVE_BMP; + if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) ) + { + // #15508# added BMP type (checked, works) + eLinkType = GFX_LINK_TYPE_NATIVE_BMP; + } } } else if( aFilterName.EqualsIgnoreCaseAscii( IMP_WMF ) || |