diff options
| -rw-r--r-- | unotools/qa/unit/testGetEnglishSearchName.cxx | 7 | ||||
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx b/unotools/qa/unit/testGetEnglishSearchName.cxx index dbc8b173a9f1..c9d8e1fbe4b4 100644 --- a/unotools/qa/unit/testGetEnglishSearchName.cxx +++ b/unotools/qa/unit/testGetEnglishSearchName.cxx @@ -39,12 +39,11 @@ void Test::testSingleElement() //trailingWhitespaces test1 = GetEnglishSearchFontName( "Symbol " ); CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1); - //removing Skripts + //no longer remove script suffixes test1 = GetEnglishSearchFontName( "Symbol(SIP)" ); CPPUNIT_ASSERT_EQUAL(OUString("symbol(sip)"),test1); - //remove Whitespaces between - test1 = GetEnglishSearchFontName( "Symbol (thai)" ); - CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1); + test1 = GetEnglishSearchFontName( "CM Roman CE" ); + CPPUNIT_ASSERT_EQUAL( OUString("cmromance"),test1); //remove special characters; leave semicolon, numbers test1 = GetEnglishSearchFontName( "sy;mb?=ol129" ); CPPUNIT_ASSERT_EQUAL( OUString("sy;mbol129"),test1); diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index f368cc628481..04c6fc4f788f 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -367,8 +367,6 @@ OUString GetEnglishSearchFontName(const OUString& rInName) if ( i != nLen ) rName.truncate(i); - // Remove Script at the end - rName = StripScriptFromName(rName.toString()); nLen = rName.getLength(); // remove all whitespaces and converts to lower case ASCII diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 56a15bfdfef0..e978eb754a23 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -38,7 +38,7 @@ #endif #define FONTCACHEFILE "/user/psprint/pspfontcache" -#define CACHE_MAGIC "LibreOffice PspFontCacheFile format 5" +#define CACHE_MAGIC "LibreOffice PspFontCacheFile format 6" using namespace std; using namespace psp; |