diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-14 13:32:24 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-14 13:32:24 +0300 |
| commit | 5bf99da78e9e4646bee0e89ff11caa6d36f0c13c (patch) | |
| tree | 3828bbf930c749fadd2053cc109367eb8a3bcf1b | |
| parent | It's the WMF_APMFILEHEADER* parameter that needs a cast, I think (diff) | |
| download | core-5bf99da78e9e4646bee0e89ff11caa6d36f0c13c.tar.gz core-5bf99da78e9e4646bee0e89ff11caa6d36f0c13c.zip | |
Revert "It's the WMF_APMFILEHEADER* parameter that needs a cast, I think"
Nope, the NULL can't be meaning the WMF_APMFILEHEADER* thing as that
is added by external-apm-header.diff.
This reverts commit 6107a6b764eecdf3d84fbf5505a8c628d8111811.
| -rw-r--r-- | svtools/source/filter.vcl/filter/exportdialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 66ef0402ff15..701619d31f6c 100644 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -521,7 +521,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) Bitmap aRet; Graphic aGraphic; GraphicFilter aFilter( sal_False ); - if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast<WMF_APMFILEHEADER*>(NULL) ) == GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, NULL ) == GRFILTER_OK ) { aRet = aGraphic.GetBitmap(); } |