diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-12 13:55:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-12 13:55:36 +0300 |
| commit | 67a8788b210dfa606ad816e62d2d22d23895cf4f (patch) | |
| tree | b716bd0361ea0843e71d9fcf9fcd5961a8b57ae1 | |
| parent | Our fontconfig baseline is 2.2.0 (diff) | |
| download | core-67a8788b210dfa606ad816e62d2d22d23895cf4f.tar.gz core-67a8788b210dfa606ad816e62d2d22d23895cf4f.zip | |
Use static_cast to resolve ambiguity between NULL and 0
| -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 701619d31f6c..f95490b57731 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, NULL ) == GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, static_cast<sal_uInt16*>(NULL), 0, NULL ) == GRFILTER_OK ) { aRet = aGraphic.GetBitmap(); } |