Author: orw
Date: Thu Jun 19 09:38:35 2014
New Revision: 1603787
URL: http://svn.apache.org/r1603787
Log:
124717: do not mark *.svm graphic files as *.bmp graphic files
cherry-picked from trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1595851
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1595851
Modified: openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx?rev=1603787&r1=1603786&r2=1603787&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx (original)
+++ openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx Thu Jun 19
09:38:35 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 ) ||
