From 8dfb14e710975ba9e5fbab2a83aa1a516ba3f1d2 Mon Sep 17 00:00:00 2001
From: Daniel Rentz <dr@openoffice.org>
Date: Fri, 15 Jan 2010 12:00:39 +0100
Subject: dr74: migrate changes to hg

---
 oox/source/export/drawingml.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'oox/source/export')

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f681477076bf..2880e61e4fc6 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1342,15 +1342,10 @@ void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorE
 // from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
 static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, String& rFontName)
 {
-    StarSymbolToMSMultiFont *pConvert = 0;
-    FontFamily eFamily = FAMILY_DECORATIVE;
-
-    if (!pConvert)
-    {
-        pConvert = CreateStarSymbolToMSMultiFont();
-    }
     sal_Unicode cChar = rNumStr.GetChar(0);
+    StarSymbolToMSMultiFont *pConvert = CreateStarSymbolToMSMultiFont();
     String sFont = pConvert->ConvertChar(cChar);
+    delete pConvert;
     if (sFont.Len())
     {
         rNumStr = static_cast< sal_Unicode >(cChar | 0xF000);
@@ -1366,7 +1361,6 @@ static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, Str
            let words own font substitution kick in
            */
         rChrSet = RTL_TEXTENCODING_UNICODE;
-        eFamily = FAMILY_SWISS;
         rFontName = ::GetFontToken(rFontName, 0);
     }
     else
@@ -1379,7 +1373,6 @@ static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, Str
         rFontName.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Wingdings"));
         rNumStr = static_cast< sal_Unicode >(0x6C);
     }
-    delete pConvert;
 }
 
 sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc )
-- 
cgit