svtools/source/misc/sampletext.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
New commits: commit 198a775ebccc69e71b97f048d1d6c4b9651662ad Author: Caolán McNamara <[email protected]> Date: Tue Aug 12 15:39:39 2014 +0100 Related: fdo#82259 Show same preview for both Symbol variants Change-Id: Iafabbe5068a1817b5be717018536e0d31117c434 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index e90b475..dd26f80 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -41,6 +41,7 @@ bool isSymbolFont(const Font &rFont) rFont.GetName().equalsIgnoreAsciiCase("MusiQwik") || rFont.GetName().equalsIgnoreAsciiCase("MusiSync") || rFont.GetName().equalsIgnoreAsciiCase("stmary10") || + rFont.GetName().equalsIgnoreAsciiCase("Symbol") || rFont.GetName().startsWith("STIX") || isOpenSymbolFont(rFont); } @@ -53,6 +54,20 @@ bool canRenderNameOfSelectedFont(OutputDevice &rDevice) OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) { + if (rDevice.GetFont().GetName() == "Symbol") + { + static const sal_Unicode aImplAppleSymbolText[] = { + 0x03BC, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x03A9, 0x221A, 0}; + OUString sSampleText(aImplAppleSymbolText); + bool bHasSampleTextGlyphs = (-1 == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); + //It's the Apple version + if (bHasSampleTextGlyphs) + return OUString(aImplAppleSymbolText); + static const sal_Unicode aImplAdobeSymbolText[] = { + 0xF06D, 0xF0B6, 0xF0E5, 0xF0D5, 0xF070, 0xF0F2, 0xF057, 0xF0D6, 0}; + return OUString(aImplAdobeSymbolText); + } + const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont()); if (!bOpenSymbol) commit 92f3e68cd107b48ca24563e27c36afa963f392e3 Author: Caolán McNamara <[email protected]> Date: Tue Aug 12 15:40:42 2014 +0100 Related: fdo#82259 esint10 can't render its name either Change-Id: Idcb881613900001f237cf343e7bc485c170e4385 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 63c0577..e90b475 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -25,6 +25,7 @@ bool isSymbolFont(const Font &rFont) rFont.GetName().equalsIgnoreAsciiCase("Apple Color Emoji") || rFont.GetName().equalsIgnoreAsciiCase("cmsy10") || rFont.GetName().equalsIgnoreAsciiCase("cmex10") || + rFont.GetName().equalsIgnoreAsciiCase("esint10") || rFont.GetName().equalsIgnoreAsciiCase("feta26") || rFont.GetName().equalsIgnoreAsciiCase("jsMath-cmsy10") || rFont.GetName().equalsIgnoreAsciiCase("jsMath-cmex10") ||
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
