[Libreoffice-commits] core.git: filter/source

[David Tardon]

 filter/source/graphic/GraphicExportFilter.cxx |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 459729627600fb057265479261ade74a55cd48d5
Author: David Tardon <dtar...@redhat.com>
Date:   Tue Mar 26 06:32:52 2013 +0100

    WaE: unused variable 'aResult'
    
    Change-Id: Ibd50c0a7af300a2d60919e24fe09e6f1c74c0851

diff --git a/filter/source/graphic/GraphicExportFilter.cxx 
b/filter/source/graphic/GraphicExportFilter.cxx
index 46a5b7f..43c65e7 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -126,13 +126,18 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const 
Sequence<PropertyValue>& rD
     SvMemoryStream aMemStream;
     const GraphicConversionParameters aParameters(aTargetSizePixel, true, 
true);
 
-    sal_uInt16 aResult =  rFilter.ExportGraphic( 
aGraphic.GetBitmapEx(aParameters), String(), aMemStream, nFilterFormat, 
&aFilterData );
+    const sal_uInt16 nResult = rFilter.ExportGraphic( 
aGraphic.GetBitmapEx(aParameters), String(), aMemStream, nFilterFormat, 
&aFilterData );
 
-    SvOutputStream aOutputStream( mxOutputStream );
-    aMemStream.Seek(0);
-    aOutputStream << aMemStream;
+    if ( nResult == GRFILTER_OK )
+    {
+        SvOutputStream aOutputStream( mxOutputStream );
+        aMemStream.Seek(0);
+        aOutputStream << aMemStream;
+
+        return true;
+    }
 
-    return true;
+    return false;
 }
 
 void SAL_CALL GraphicExportFilter::cancel( ) throw (RuntimeException)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits