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

[Tor Lillqvist]

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

New commits:
commit 6107a6b764eecdf3d84fbf5505a8c628d8111811
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 13:01:34 2011 +0300

    It's the WMF_APMFILEHEADER* parameter that needs a cast, I think

diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx
index af5f61d..c6b6e4b 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, NULL, 0, static_cast<WMF_APMFILEHEADER*>(NULL) ) == GRFILTER_OK )
     {
         aRet = aGraphic.GetBitmap();
     }
commit bc944877411e71f2c2582967b9b4f06ac0b583c3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 13:00:13 2011 +0300

    Revert "Use static_cast to resolve ambiguity between NULL and 0"
    
    This was not the actual problem.
    
    This reverts commit 0d74c4b027b057c2552311be12571c044f472ad8.

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