diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-19 22:44:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-20 11:42:36 +0200 |
| commit | bb2d711998b997eb4e4d0d8498cca7a212ba71ef (patch) | |
| tree | 5f52973be6ebb56ba9e8227cb083a8fe7b3f0fab | |
| parent | c3f9fa6f3a18ffe088a1fbc6280ade296967e66a (diff) | |
filter: bestFitOpenSymbolToMSFont() parameter bDisableUnicodeSupport
... is obsolete
Change-Id: I644f80ac4bf265f2c669a9d1b87fecd012756be2
| -rw-r--r-- | filter/source/msfilter/util.cxx | 4 | ||||
| -rw-r--r-- | include/filter/msfilter/util.hxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 9031a7761938..dd1253ce3d54 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -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 diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 1164889e8419..9ab24396ba2e 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -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 diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 4c053712f327..650743addb67 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -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; |