Author: orw
Date: Mon May 19 11:50:38 2014
New Revision: 1595851
URL: http://svn.apache.org/r1595851
Log:
124717: do not mark *.svm graphic files as *.bmp graphic files
Modified:
openoffice/trunk/main/svtools/source/filter/filter.cxx
Modified: openoffice/trunk/main/svtools/source/filter/filter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/filter/filter.cxx?rev=1595851&r1=1595850&r2=1595851&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/filter/filter.cxx (original)
+++ openoffice/trunk/main/svtools/source/filter/filter.cxx Mon May 19 11:50:38
2014
@@ -1630,8 +1630,8 @@ sal_uInt16 GraphicFilter::ImportGraphic(
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(
}
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 ) ||
