Kaydet (Commit) 019a8f3f authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#66524 string conversion gone wrong

Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0
üst 21b2b1c0
...@@ -264,10 +264,10 @@ void FontCache::read() ...@@ -264,10 +264,10 @@ void FontCache::read()
do do
{ {
aStream.ReadLine( aLine ); aStream.ReadLine( aLine );
if( aLine == "FontCacheDirectory:" || if( aLine.startsWith("FontCacheDirectory:") ||
aLine == "EmptyFontCacheDirectory:" ) aLine.startsWith("EmptyFontCacheDirectory:") )
{ {
bool bEmpty = (aLine == "Empty" ); bool bEmpty = aLine.startsWith("Empty");
sal_Int32 nSearchIndex = bEmpty ? 24 : 19; sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
OString aDir; OString aDir;
...@@ -309,7 +309,7 @@ void FontCache::read() ...@@ -309,7 +309,7 @@ void FontCache::read()
m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden; m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
} }
} }
else if( pDir && aLine == "File:") else if( pDir && aLine.startsWith("File:") )
{ {
OString aFile( aLine.copy( 5 ) ); OString aFile( aLine.copy( 5 ) );
aStream.ReadLine( aLine ); aStream.ReadLine( aLine );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment