summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-04-14 13:00:13 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-04-14 13:00:13 +0300
commitd6c542e9912eee3bff23890108a56a0863b32092 (patch)
tree3828bbf930c749fadd2053cc109367eb8a3bcf1b /svtools
parent535300da9a037edcdf047cc07f3830c70623a146 (diff)
Revert "Use static_cast to resolve ambiguity between NULL and 0"
This was not the actual problem. This reverts commit 0d74c4b027b057c2552311be12571c044f472ad8.
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/filter.vcl/filter/exportdialog.cxx2
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 f95490b57731..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, static_cast<sal_uInt16*>(NULL), 0, NULL ) == GRFILTER_OK )
+ if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, NULL ) == GRFILTER_OK )
{
aRet = aGraphic.GetBitmap();
}