[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 a744dc832da5edf5dc3db6aeb6c4b1dc7981de2b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 13:34:58 2011 +0300

    The NULL must be a css::uno::Sequence< css::beans::PropertyValue >*, I think

diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx
index af5f61d..81172df 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<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL) ) == GRFILTER_OK )
     {
         aRet = aGraphic.GetBitmap();
     }
commit 5c06e7530c9672be8f8ea1440181ea1a4f3436e8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 13:32:24 2011 +0300

    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.

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