ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

filter: bestFitOpenSymbolToMSFont() parameter bDisableUnicodeSupport

Browse Source 
... is obsolete

Change-Id: I644f80ac4bf265f2c669a9d1b87fecd012756be2
This commit is contained in:
Michael Stahl
2015-06-20 11:42:36 +02:00
parent c3f9fa6f3a
commit bb2d711998
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/source/msfilter/util.cxx
+2 -2
View File
@@ -87,7 +87,7 @@ DateTime DTTM2DateTime( long lDTTM )
}
sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
rtl_TextEncoding& rChrSet, OUString& rFontName, bool bDisableUnicodeSupport)
rtl_TextEncoding& rChrSet, OUString& rFontName)
{
boost::scoped_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont());
OUString sFont = pConvert->ConvertChar(cChar);
@@ -98,7 +98,7 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
rFontName = sFont;
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
include/filter/msfilter/util.hxx
+1 -3
View File
@@ -48,11 +48,9 @@ to find it, unfortunately :-(
/// best-fit replacement in terms of default available MSOffice symbol
/// fonts.
///
/// Set bDisableUnicodeSupport when exporting to 8bit encodings
///
/// Used to map from [Open|Star]Symbol to some Windows font or other.
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
sw/source/filter/ww8/wrtw8num.cxx
+1 -1
View File
@@ -749,7 +749,7 @@ void MSWordExportBase::SubstituteBullet( OUString& rNumStr,
if (rNumStr[0] != sal_Unicode(0x0))
{
rNumStr = rNumStr.replaceAt(0, 1, OUString(
msfilter::util::bestFitOpenSymbolToMSFont(rNumStr[0], rChrSet, sFontName, false)));
msfilter::util::bestFitOpenSymbolToMSFont(rNumStr[0], rChrSet, sFontName)));
}
rFontName = sFontName;