diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 15:24:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 16:54:54 +0100 |
| commit | 2c0831ebbf940833c3fecc66abd1ce0f3a29cd10 (patch) | |
| tree | 2915f157a0857d3158b94e8dcdbcb97879106fb5 /vcl/unx/generic | |
| parent | 2f33cf5115df156cc17f6218ca42ca367cd32cf4 (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index dbd73f829845..0028f0499032 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -1020,16 +1020,16 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult continue; } - ByteString aTranslate; + rtl::OStringBuffer aTranslate; if( pChar->code & 0xff000000 ) - aTranslate += (char)(pChar->code >> 24 ); + aTranslate.append((char)(pChar->code >> 24)); if( pChar->code & 0xffff0000 ) - aTranslate += (char)((pChar->code & 0x00ff0000) >> 16 ); + aTranslate.append((char)((pChar->code & 0x00ff0000) >> 16)); if( pChar->code & 0xffffff00 ) - aTranslate += (char)((pChar->code & 0x0000ff00) >> 8 ); - aTranslate += (char)(pChar->code & 0xff); - String aUni( aTranslate, m_aEncoding ); - pUnicodes[i] = *aUni.GetBuffer(); + aTranslate.append((char)((pChar->code & 0x0000ff00) >> 8 )); + aTranslate.append((char)(pChar->code & 0xff)); + rtl::OUString aUni(rtl::OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding)); + pUnicodes[i] = aUni.toChar(); } else pUnicodes[i] = 0; @@ -2403,11 +2403,10 @@ void PrintFontManager::initialize() while( ! readdir_r( pDIR, (struct dirent*)aDirEntBuffer, &pDirEntry ) && pDirEntry ) { - ByteString aFile( aDir ); - aFile += '/'; - aFile += pDirEntry->d_name; + rtl::OStringBuffer aFile(aDir); + aFile.append('/').append(pDirEntry->d_name); struct stat aStat; - if( ! stat( aFile.GetBuffer(), &aStat ) + if( ! stat( aFile.getStr(), &aStat ) && S_ISREG( aStat.st_mode ) ) { |