svtools/source/misc/sampletext.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
New commits: commit 662af47c3c1628700661a8d5ccfee784f7e2195b Author: Caolán McNamara <[email protected]> Date: Tue Aug 12 14:57:14 2014 +0100 Related: fdo#82259 OpenSymbol doesn't have 0x2706 or 0x2704 so no preview Change-Id: I2164cb2c37c7b13759e47561002024fd2bb577f9 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 257a97f..63c0577 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -90,7 +90,7 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) static const sal_Unicode aImplSymbolFontText[] = { 0xF021,0xF032,0xF043,0xF054,0xF065,0xF076,0xF0B7,0xF0C8,0}; static const sal_Unicode aImplStarSymbolText[] = { - 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0}; + 0x2702,0x2708,0x270D,0xE033,0x2211,0x2288,0}; const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText; OUString sSampleText(pText); bool bHasSampleTextGlyphs = (-1 == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); commit 16076f120340673ad64df1614206f0e13e3539d5 Author: Caolán McNamara <[email protected]> Date: Tue Aug 12 14:42:26 2014 +0100 Resolves: fdo#82259 use same symbol strategy on all platforms Change-Id: Ia4f0a36c8a95849b7c8551b930873e912b673537 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 905ddec..257a97f 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -65,11 +65,6 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) // start just above the PUA used by most symbol fonts sal_uInt32 cNewChar = 0xFF00; -#ifdef MACOSX - // on MacOSX there are too many non-presentable symbols above the codepoint 0x0192 - if( !bOpenSymbol ) - cNewChar = 0x0192; -#endif const int nMaxCount = sizeof(aText)/sizeof(*aText) - 1; int nSkip = aFontCharMap.GetCharCount() / nMaxCount; commit b56bb5dce9a225bb0b8d6c57120da55e4cae7def Author: Caolán McNamara <[email protected]> Date: Tue Aug 12 14:40:48 2014 +0100 Related: fdo#82259 all the STIX fonts are really for symbols Change-Id: Id032f1b643199a57c6fc08ccf580a54ff2370861 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 59440c1..905ddec 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -40,6 +40,7 @@ bool isSymbolFont(const Font &rFont) rFont.GetName().equalsIgnoreAsciiCase("MusiQwik") || rFont.GetName().equalsIgnoreAsciiCase("MusiSync") || rFont.GetName().equalsIgnoreAsciiCase("stmary10") || + rFont.GetName().startsWith("STIX") || isOpenSymbolFont(rFont); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
