4 files changed, 37 insertions, 5 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 2c8130667c6b..fc8de3b18f68 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1531,6 +1531,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "d", sPathData );
     SvXMLElementExport aPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "path", true, true );
 
+    mpSVGExport->SetEmbeddedBulletGlyph(cBullet);
 }
 
 void SVGFilter::implExportBackgroundBitmaps()
@@ -2865,4 +2866,15 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf )
     }
 }
 
+void SVGExport::SetEmbeddedBulletGlyph(sal_Unicode cBullet)
+{
+    maEmbeddedBulletGlyphs.insert(cBullet);
+}
+
+bool SVGExport::IsEmbeddedBulletGlyph(sal_Unicode cBullet) const
+{
+    auto it = maEmbeddedBulletGlyphs.find(cBullet);
+    return it != maEmbeddedBulletGlyphs.end();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 7bdaa9d60f09..aab158971e0b 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -66,6 +66,7 @@ class SVGExport : public SvXMLExport
     bool    mbIsUseOpacity;
     bool    mbIsUseNativeTextDecoration;
     bool    mbIsUsePositionedCharacters;
+    std::set<sal_Unicode> maEmbeddedBulletGlyphs;
 
 public:
 
@@ -84,6 +85,9 @@ public:
 
     void writeMtf( const GDIMetaFile& rMtf );
 
+    void SetEmbeddedBulletGlyph(sal_Unicode cBullet);
+    bool IsEmbeddedBulletGlyph(sal_Unicode cBullet) const;
+
 protected:
 
     virtual void            ExportStyles_( bool /* bUsed */ ) override {}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 57ccc67bf6ef..866594439abc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1428,11 +1428,12 @@ void SVGTextWriter::implWriteBulletChars()
 
             SvXMLElementExport aPositioningElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true );
 
-            // <use transform="scale(font-size)" xlink:ref="/" >
+            if (mrExport.IsEmbeddedBulletGlyph(rInfo.cBulletChar))
             {
+                // <use transform="scale(font-size)" xlink:ref="/" >
                 // Add size attribute through a scaling
-                sScaling = "scale(" + OUString::number( rInfo.nFontSize ) +
-                           "," + OUString::number( rInfo.nFontSize )+ ")";
+                sScaling = "scale(" + OUString::number( rInfo.aFont.GetFontHeight() ) +
+                           "," + OUString::number( rInfo.aFont.GetFontHeight() )+ ")";
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sScaling );
 
                 // Add ref attribute
@@ -1442,6 +1443,21 @@ void SVGTextWriter::implWriteBulletChars()
 
                 SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", true, true );
             }
+            else
+            {
+                // <path d="...">
+                tools::PolyPolygon aPolyPolygon;
+                OUString aStr(rInfo.cBulletChar);
+                mpVDev->Push(PushFlags::FONT);
+                mpVDev->SetFont(rInfo.aFont);
+                if (mpVDev->GetTextOutline(aPolyPolygon, aStr))
+                {
+                    OUString aPathString(SVGActionWriter::GetPathString(aPolyPolygon, false));
+                    mrExport.AddAttribute(XML_NAMESPACE_NONE, "d", aPathString);
+                    SvXMLElementExport aPath(mrExport, XML_NAMESPACE_NONE, "path", true, true);
+                }
+                mpVDev->Pop();
+            }
         } // close aPositioningElem
     }
 
@@ -1696,7 +1712,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
             {
                 sId += ".bp";
                 BulletListItemInfo& aBulletListItemInfo = maBulletListItemMap[ sId ];
-                aBulletListItemInfo.nFontSize = rFont.GetFontHeight();
+                aBulletListItemInfo.aFont = rFont;
                 aBulletListItemInfo.aColor = aTextColor;
                 aBulletListItemInfo.aPos = maTextPos;
                 aBulletListItemInfo.cBulletChar = mcBulletChar;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 993d1162fcf3..a052fba16e87 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -189,7 +189,7 @@ class GDIMetaFile;
 
 struct BulletListItemInfo
 {
-    tools::Long nFontSize;
+    vcl::Font aFont;
     Color aColor;
     Point aPos;
     sal_Unicode cBulletChar;