[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svtools/source

[Tor Lillqvist]

 svtools/source/filter.vcl/filter/exportdialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d74c4b027b057c2552311be12571c044f472ad8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 12 13:55:11 2011 +0300

    Use static_cast to resolve ambiguity between NULL and 0

diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx
index af5f61d..c793623 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();
     }