fix HTML export of linked image bullets

Change-Id: I14ade42adfff9beb0e40eb0d7e5569cbef0ced06

sw/source/filter/html/htmlatr.cxx

@@ -978,7 +978,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
         const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
         OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush(),
-                             rHWrt.aBulletGrfs[nBulletGrfLvl],
                              rNumFmt.GetGraphicSize(), rNumFmt.GetGraphicOrientation() );
     }
 

sw/source/filter/html/htmlfly.cxx

@@ -1199,21 +1199,13 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 Writer& OutHTML_BulletImage( Writer& rWrt,
                              const sal_Char *pTag,
                              const SvxBrushItem* pBrush,
-                             String &rGrfName,
                              const Size &rSize,
                              const SwFmtVertOrient* pVertOrient )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    //Wenn es ein BrushItem gibt, muss die Grafiknoch exportiert werden
-    const String *pLink = 0;
     OUString aGraphicInBase64;
     if( pBrush )
-    {
-        pLink = pBrush->GetGraphicLink();
-
-        //embeddete Grafik -> WriteEmbedded schreiben
-        if( !pLink )
     {
         const Graphic* pGrf = pBrush->GetGraphic();
         if( pGrf )
@@ -1223,10 +1215,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
             {
                 rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
             }
-                if( rHTMLWrt.GetOrigFileName() )
-                    rGrfName = *rHTMLWrt.GetOrigFileName();
-                pLink = &rGrfName;
-            }
         }
     }
 
@@ -1234,8 +1222,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
     if( pTag )
         sOut.append('<').append(pTag);
 
-    if( pLink )
-    {
     sOut.append(' ');
     sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"").
     append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
@@ -1290,7 +1276,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
                 append('=').append(pStr);
         }
     }
-    }
 
     if (pTag)
         sOut.append('>');

sw/source/filter/html/htmlnum.cxx

@@ -827,7 +827,6 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
             OutHTML_BulletImage( rWrt,
                                     0,
                                     rNumFmt.GetBrush(),
-                                    rWrt.aBulletGrfs[i],
                                     rNumFmt.GetGraphicSize(),
                                     rNumFmt.GetGraphicOrientation() );
         }

sw/source/filter/html/wrthtml.hxx

@@ -636,7 +636,7 @@ Writer& OutHTML_Image( Writer&, const SwFrmFmt& rFmt,
                        const ImageMap *pGenImgMap = 0 );
 
 Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag,
-                             const SvxBrushItem* pBrush, String &rGrfName,
+                             const SvxBrushItem* pBrush,
                              const Size &rSize,
                              const SwFmtVertOrient* pVertOrient );