[Libreoffice-commits] core.git: 2 commits - svx/source sw/source

[Andras Timar]

 svx/source/xoutdev/_xoutbmp.cxx   |    1 -
 sw/source/filter/html/htmlfly.cxx |    6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0b48a9b5e05e57306d7f3a32d2be01bb352b0d18
Author: Andras Timar <atimar at suse.com>
Date:   Thu Jul 11 15:17:15 2013 +0200

    remove unused headers
    
    Change-Id: I3345e6322a9aa25239df98033b8436ec377e197f

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 40f9f7f..bad0533 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -31,7 +31,6 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <sax/tools/converter.hxx>
-#include <svtools/htmlkywd.hxx>
 
 #define FORMAT_BMP  OUString("bmp")
 #define FORMAT_GIF  OUString("gif")
commit e6fb87e6039de7d871563cd14b5b9d21129cd216
Author: Andras Timar <atimar at suse.com>
Date:   Thu Jul 11 15:15:08 2013 +0200

    statement aligned as second statement in if body but not in a statement block
    
    Change-Id: I0d691c75cc5477b3b0f9c6f6f2dc420a51751201

diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 0bac1d7..fb7ac88 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1220,16 +1220,14 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
             const Graphic* pGrf = pBrush->GetGraphic();
             if( pGrf )
             {
-                const Graphic* aGraphic = pBrush->GetGraphic();
-                sal_uLong nErr = XOutBitmap::GraphicToBase64(*aGraphic, aGraphicInBase64);
+                sal_uLong nErr = XOutBitmap::GraphicToBase64(*pGrf, aGraphicInBase64);
                 if( nErr )
                 {
                     rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
                 }
-                // Grafik als (JPG-)File speichern
                 if( rHTMLWrt.GetOrigFileName() )
                     rGrfName = *rHTMLWrt.GetOrigFileName();
-                    pLink = &rGrfName;
+                pLink = &rGrfName;
             }
         }
     }