summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-07-11 19:32:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-07-11 20:04:56 +0100
commit019a8f3f74ec778d5fead4d2b4d47e75cf750bf7 (patch)
tree5901504d0f95bbffcd182143f4ef59534362e9dc
parent21b2b1c04998307d71129e607508007a795a7ce7 (diff)
Resolves: fdo#66524 string conversion gone wrong
Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0
-rw-r--r--vcl/generic/fontmanager/fontcache.cxx8
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 );