Kaydet (Commit) bb2d7119 authored tarafından Michael Stahl's avatar Michael Stahl

filter: bestFitOpenSymbolToMSFont() parameter bDisableUnicodeSupport

... is obsolete

Change-Id: I644f80ac4bf265f2c669a9d1b87fecd012756be2
üst c3f9fa6f
...@@ -87,7 +87,7 @@ DateTime DTTM2DateTime( long lDTTM ) ...@@ -87,7 +87,7 @@ DateTime DTTM2DateTime( long lDTTM )
} }
sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
rtl_TextEncoding& rChrSet, OUString& rFontName, bool bDisableUnicodeSupport) rtl_TextEncoding& rChrSet, OUString& rFontName)
{ {
boost::scoped_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont()); boost::scoped_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont());
OUString sFont = pConvert->ConvertChar(cChar); OUString sFont = pConvert->ConvertChar(cChar);
...@@ -98,7 +98,7 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, ...@@ -98,7 +98,7 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
rFontName = sFont; rFontName = sFont;
rChrSet = RTL_TEXTENCODING_SYMBOL; rChrSet = RTL_TEXTENCODING_SYMBOL;
} }
else if (!bDisableUnicodeSupport && (cChar < 0xE000 || cChar > 0xF8FF)) else if (cChar < 0xE000 || cChar > 0xF8FF)
{ {
/* /*
Ok we can't fit into a known windows unicode font, but Ok we can't fit into a known windows unicode font, but
......
...@@ -48,11 +48,9 @@ to find it, unfortunately :-( ...@@ -48,11 +48,9 @@ to find it, unfortunately :-(
/// best-fit replacement in terms of default available MSOffice symbol /// best-fit replacement in terms of default available MSOffice symbol
/// fonts. /// fonts.
/// ///
/// Set bDisableUnicodeSupport when exporting to 8bit encodings
///
/// Used to map from [Open|Star]Symbol to some Windows font or other. /// Used to map from [Open|Star]Symbol to some Windows font or other.
MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet, MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet,
rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName, bool bDisableUnicodeSupport = false); rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName);
enum TextCategory enum TextCategory
......
...@@ -749,7 +749,7 @@ void MSWordExportBase::SubstituteBullet( OUString& rNumStr, ...@@ -749,7 +749,7 @@ void MSWordExportBase::SubstituteBullet( OUString& rNumStr,
if (rNumStr[0] != sal_Unicode(0x0)) if (rNumStr[0] != sal_Unicode(0x0))
{ {
rNumStr = rNumStr.replaceAt(0, 1, OUString( rNumStr = rNumStr.replaceAt(0, 1, OUString(
msfilter::util::bestFitOpenSymbolToMSFont(rNumStr[0], rChrSet, sFontName, false))); msfilter::util::bestFitOpenSymbolToMSFont(rNumStr[0], rChrSet, sFontName)));
} }
rFontName = sFontName; rFontName = sFontName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment