diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 19:32:57 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-07-12 06:50:22 +0000 |
| commit | 32e931cd08423bbe74a2532f7eba2b3f6c374233 (patch) | |
| tree | 9cce6ed9ba934b88dca2ba17b1c072bc69419f7c | |
| parent | 948dc44712f41c6a12342e4f44e0f2039f62744b (diff) | |
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 <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Andras Timar <atimar@suse.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 0d14d48c58a3..0f6c6777c3cb 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 ); |