diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-05-19 11:50:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-23 20:38:13 +0100 |
| commit | 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec (patch) | |
| tree | a1e236fb56721848ab0c1b63197588cf1c434cbc /vcl | |
| parent | 192abfb36b8a4859879fcb49326d59ed62083c8d (diff) | |
Resolves: #i124717# do not mark *.svm graphic files as *.bmp graphic files
(cherry picked from commit a5cfb91f3dc4b38055fb920f65101cc45d52f8de)
Conflicts:
svtools/source/filter/filter.cxx
Change-Id: I43f62a453bfa17254cebc07bde95f07f16a329c2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 2485d442aa99..1f132f364139 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1592,7 +1592,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat { nStatus = GRFILTER_FORMATERROR; } - else + else if (aFilterName.equalsIgnoreAsciiCase(IMP_BMP)) { // #i15508# added BMP type (checked, works) eLinkType = GFX_LINK_TYPE_NATIVE_BMP; |