summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-07-07 10:23:28 +0200
committerTomaž Vajngerl <quikee@gmail.com>2020-07-10 09:08:34 +0200
commit36962d9cc105d2c98889ee841438823fce090dfb (patch)
tree5143937f3cef6c9d369bb62748505c075f8b1b32 /svx
parenta7cf65ac009819cb6ae3c08e5fe3f496ef31260a (diff)
tdf#60684: graphic type content must correspond with graphic type extension
Change-Id: I8075b1b44aa400268b4022decb2a56770c81d83b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98239 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 7272a2edf113f29edeb8987ce649f85b776d9d23) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98342 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 500a30375c62..15123e853484 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -187,7 +187,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
break;
}
- if( !aExt.isEmpty() )
+ // tdf#60684: use native format if possible but it must correspond to filter name
+ // or no specific format has been required
+ // without this, you may save for example file with png extension but jpg content
+ if( !aExt.isEmpty() && (aExt == rFilterName || rFilterName.isEmpty()) )
{
if( !(nFlags & XOutFlags::DontAddExtension) )
aURL.setExtension( aExt );