vcl/generic/fontmanager/fontcache.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 32e931cd08423bbe74a2532f7eba2b3f6c374233 Author: Caolán McNamara <[email protected]> Date: Thu Jul 11 19:32:57 2013 +0100 Resolves: fdo#66524 string conversion gone wrong Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0 (cherry picked from commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7) Reviewed-on: https://gerrit.libreoffice.org/4849 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 0d14d48..0f6c677 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -264,10 +264,10 @@ void FontCache::read() do { aStream.ReadLine( aLine ); - if( aLine == "FontCacheDirectory:" || - aLine == "EmptyFontCacheDirectory:" ) + if( aLine.startsWith("FontCacheDirectory:") || + aLine.startsWith("EmptyFontCacheDirectory:") ) { - bool bEmpty = (aLine == "Empty" ); + bool bEmpty = aLine.startsWith("Empty"); sal_Int32 nSearchIndex = bEmpty ? 24 : 19; OString aDir; @@ -309,7 +309,7 @@ void FontCache::read() m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden; } } - else if( pDir && aLine == "File:") + else if( pDir && aLine.startsWith("File:") ) { OString aFile( aLine.copy( 5 ) ); aStream.ReadLine( aLine );
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
