diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:30:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:47:07 +0100 |
commit | 973b47a336b239cc92f1789013d28e5bd55f859f (patch) | |
tree | 6481f2803208409896aecf6745239cf07953baab /vcl/generic/fontmanager | |
parent | 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (diff) |
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
Diffstat (limited to 'vcl/generic/fontmanager')
-rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 4644b7ab89af..ea5b443cc0a3 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -352,7 +352,7 @@ void FontCache::read() pFont->m_nFamilyName = pAtoms->getAtom( ATOM_FAMILYNAME, OUString( pLine, nIndex, RTL_TEXTENCODING_UTF8 ), - sal_True ); + true ); while( nIndex < nLen ) { sal_Int32 nLastIndex = nIndex+1; @@ -361,7 +361,7 @@ void FontCache::read() if( nIndex - nLastIndex ) { OUString aAlias( pLine+nLastIndex, nIndex-nLastIndex, RTL_TEXTENCODING_UTF8 ); - pFont->m_aAliases.push_back( pAtoms->getAtom( ATOM_FAMILYNAME, aAlias, sal_True ) ); + pFont->m_aAliases.push_back( pAtoms->getAtom( ATOM_FAMILYNAME, aAlias, true ) ); } } aStream.ReadLine( aLine ); @@ -388,7 +388,7 @@ void FontCache::read() continue; } int nCollEntry = atoi( pLine ); - pFont->m_nPSName = pAtoms->getAtom( ATOM_PSNAME, OUString( pLine + nTokenPos[1], nTokenPos[2]-nTokenPos[1]-1, RTL_TEXTENCODING_UTF8 ), sal_True ); + pFont->m_nPSName = pAtoms->getAtom( ATOM_PSNAME, OUString( pLine + nTokenPos[1], nTokenPos[2]-nTokenPos[1]-1, RTL_TEXTENCODING_UTF8 ), true ); pFont->m_eItalic = (FontItalic)atoi( pLine+nTokenPos[2] ); pFont->m_eWeight = (FontWeight)atoi( pLine+nTokenPos[3] ); pFont->m_eWidth = (FontWidth)atoi( pLine+nTokenPos[4] ); diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 4ff925aff0bc..536dd769904c 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -575,7 +575,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, continue; } - int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), sal_True ); + int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), true ); PrintFont* pUpdate = aFonts.front(); std::list<PrintFont*>::const_iterator second_font = aFonts.begin(); ++second_font; diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 4f4d99b95a90..004f17e30ddb 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -321,7 +321,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, // PSName OUString aPSName( OStringToOUString( pInfo->gfi->fontName, RTL_TEXTENCODING_ISO_8859_1 ) ); - m_nPSName = pProvider->getAtom( ATOM_PSNAME, aPSName, sal_True ); + m_nPSName = pProvider->getAtom( ATOM_PSNAME, aPSName, true ); // family name (if not already set) OUString aFamily; @@ -335,7 +335,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, aFamily = aFamily.getToken( 0, '-', nIndex ); } familyNameOverride( aPSName, aFamily ); - m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily, sal_True ); + m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily, true ); } else aFamily = pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName ); @@ -1163,7 +1163,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { if( aNames.begin() != aNames.end() ) { - pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), sal_True ); + pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), true ); aNames.pop_front(); } else @@ -1176,14 +1176,14 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const if ( dotIndex == -1 ) dotIndex = pTTFontFile->m_aFontFile.getLength(); - pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( pTTFontFile->m_aFontFile.copy( 0, dotIndex ), aEncoding ), sal_True ); + pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( pTTFontFile->m_aFontFile.copy( 0, dotIndex ), aEncoding ), true ); } } for( ::std::list< OUString >::iterator it = aNames.begin(); it != aNames.end(); ++it ) { if( !it->isEmpty() ) { - int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it, sal_True ); + int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it, true ); if( nAlias != pFont->m_nFamilyName ) { std::list< int >::const_iterator al_it; @@ -1204,7 +1204,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : m_pAtoms->getString(ATOM_FAMILYNAME, pFont->m_nFamilyName); // poor font does not have a postscript name - pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, sal_True ); + pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, true ); switch( aInfo.weight ) { |