summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-16 11:14:05 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-03-16 10:27:43 +0000
commitf958db475d19ac60f39616e075717c2fe3ee4839 (patch)
tree2665b94e4302d9853e4913a7e82a3f35017786f4 /vcl/unx
parente41d23abb03a0c5a5c50be290c2265513e178889 (diff)
loplugin:constantparam in unotools/
Change-Id: I016cf96af3a93c8f2114657a7e59599f68446ddc Reviewed-on: https://gerrit.libreoffice.org/23296 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/fontmanager/fontcache.cxx7
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx12
3 files changed, 10 insertions, 11 deletions
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index bd85f9b629a6..25526d82eb27 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -347,8 +347,7 @@ void FontCache::read()
;
pFont->m_nFamilyName = pAtoms->getAtom( ATOM_FAMILYNAME,
- OUString( pLine, nIndex, RTL_TEXTENCODING_UTF8 ),
- true );
+ OUString( pLine, nIndex, RTL_TEXTENCODING_UTF8 ) );
while( nIndex < nLen )
{
sal_Int32 nLastIndex = nIndex+1;
@@ -357,7 +356,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, true ) );
+ pFont->m_aAliases.push_back( pAtoms->getAtom( ATOM_FAMILYNAME, aAlias ) );
}
}
aStream.ReadLine( aLine );
@@ -384,7 +383,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 ), true );
+ pFont->m_nPSName = pAtoms->getAtom( ATOM_PSNAME, OUString( pLine + nTokenPos[1], nTokenPos[2]-nTokenPos[1]-1, RTL_TEXTENCODING_UTF8 ) );
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/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index aff28486b148..8bccc020b92a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -574,7 +574,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS
continue;
}
- int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( reinterpret_cast<char*>(family) ), RTL_TEXTENCODING_UTF8 ), true );
+ int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( reinterpret_cast<char*>(family) ), RTL_TEXTENCODING_UTF8 ) );
PrintFont* pUpdate = aFonts.front();
std::list<PrintFont*>::const_iterator second_font = aFonts.begin();
++second_font;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 2c5c7aad3911..d7b4bd3f7c7f 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -293,7 +293,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, true );
+ m_nPSName = pProvider->getAtom( ATOM_PSNAME, aPSName );
// family name (if not already set)
OUString aFamily;
@@ -307,7 +307,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
aFamily = aFamily.getToken( 0, '-', nIndex );
}
familyNameOverride( aPSName, aFamily );
- m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily, true );
+ m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily );
}
else
aFamily = pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName );
@@ -1209,7 +1209,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
{
if( !aNames.empty() )
{
- pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), true );
+ pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front() );
aNames.pop_front();
}
else
@@ -1222,14 +1222,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 ), true );
+ pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( pTTFontFile->m_aFontFile.copy( 0, dotIndex ), aEncoding ) );
}
}
for( ::std::list< OUString >::iterator it = aNames.begin(); it != aNames.end(); ++it )
{
if( !it->isEmpty() )
{
- int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it, true );
+ int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it );
if( nAlias != pFont->m_nFamilyName )
{
std::list< int >::const_iterator al_it;
@@ -1250,7 +1250,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, true );
+ pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName );
switch( aInfo.weight )
{