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>

19 files changed, 42 insertions, 75 deletions

diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index f8f684cc3cca..a60ae008954f 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -51,7 +51,7 @@ namespace utl {
         MultiAtomProvider();
         ~MultiAtomProvider();
 
-        int getAtom( int atomClass, const OUString& rString, bool bCreate = false );
+        int getAtom( int atomClass, const OUString& rString );
 
         const OUString& getString( int atomClass, int atom ) const;
     };
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index a481c65548b1..7cbe8970b2aa 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -92,7 +92,6 @@ namespace utl
             const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
             ::osl::Mutex& _rAccessSafety,
             const sal_Char* _pConfigLocation,
-            const CVCFlags _nAccessFlags = CVCFlags::UPDATE_ACCESS | CVCFlags::LAZY_UPDATE,
             const sal_Int32 _nLevels = -1
         );
 
@@ -142,14 +141,12 @@ namespace utl
             @precond
                 The access must have been created for update access
 
-            @param _bCommit
-                If set to <TRUE/>, an automatic commit is done after the values have been synchronized.<br/>
-                If set to <FALSE/>, you must explicitly call <method>commit</method> to make your changes persistent.
+            You must explicitly call <method>commit</method> to make your changes persistent.
 
             @see read
             @see commit
         */
-        void    write( bool _bCommit = true );
+        void    write();
 
         /** commits any changes done
 
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index a1f559149129..9d99f516af70 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -245,24 +245,12 @@ public:
 
                         /** The CalendarWrapper already <b>MUST</b>
                             have loaded a calendar.
-                            @param nDisplayDayOfWeek
-                                0 := abbreviated name
-                                1 := full name
-                            @param bDayOfMonthWithLeadingZero
-                                <FALSE/> := without leading zero
-                                <TRUE/>  := with leading zero if <10
-                            @param nDisplayMonth
-                                0 := abbreviated name
-                                1 := full name
                             @param bTwoDigitYear
                                 <FALSE/> := full year
                                 <TRUE/>  := year % 100
                          */
     OUString       getLongDate( const Date& rDate,
                             CalendarWrapper& rCal,
-                            sal_Int16 nDisplayDayOfWeek = 1,
-                            bool bDayOfMonthWithLeadingZero = false,
-                            sal_Int16 nDisplayMonth = 1,
                             bool bTwoDigitYear = false
                             ) const;
 
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 2fbd5dec550b..7b6091a48d77 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -47,10 +47,9 @@ class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base
 
 public:
     OInputStreamHelper(const SvLockBytesRef& _xLockBytes,
-                       sal_uInt32 _nAvailable,
-                       sal_uInt64 _nPos = 0)
+                       sal_uInt32 _nAvailable)
         :m_xLockBytes(_xLockBytes)
-        ,m_nActPos(_nPos)
+        ,m_nActPos(0)
         ,m_nAvailable(_nAvailable){}
 
 // css::uno::XInterface
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index df4f4fbccd3f..40c880835a7e 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -67,7 +67,7 @@ public:
                     The extension string may be f.e. ".txt" or "", if no extension string is given, ".tmp" is used
                         @param  _bStartWithZero If set to false names will be generated like "abc","abc0","abc1"
                     */
-                    TempFile( const OUString& rLeadingChars, bool _bStartWithZero=true, const OUString* pExtension=nullptr, const OUString* pParent=nullptr, bool bDirectory=false);
+                    TempFile( const OUString& rLeadingChars, bool _bStartWithZero=true, const OUString* pExtension=nullptr, const OUString* pParent=nullptr);
 
                     /**
                     TempFile will be removed from disk in dtor if EnableKillingFile(true) was called before.
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 3a24aac648df..570efcb769b2 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -116,8 +116,6 @@ public:
     SearchParam( const OUString &rText,
                     SearchType eSrchType = SearchParam::SRCH_NORMAL,
                     bool bCaseSensitive = true,
-                    bool bWordOnly = false,
-                    bool bSearchInSelection = false,
                     sal_uInt32 cWildEscChar = '\\',
                     bool bWildMatchSel = false );
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fe973d3dee39..8f262b7b4c0a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8148,7 +8148,7 @@ void ScInterpreter::ScSearch()
         else
         {
             utl::SearchParam::SearchType eSearchType = DetectSearchType( SearchStr, pDok );
-            utl::SearchParam sPar(SearchStr, eSearchType, false, false, false, '~', false);
+            utl::SearchParam sPar(SearchStr, eSearchType, false, '~', false);
             utl::TextSearch sT( sPar, *ScGlobal::pCharClass );
             bool bBool = sT.SearchForward(sStr, &nPos, &nEndPos);
             if (!bBool)
diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx
index e628baaffb47..749b1424cb0b 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -171,7 +171,7 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( utl::SearchParam::SearchType eS
     {
         OUString aStr = maQueryItems[0].maString.getString();
         pSearchParam = new utl::SearchParam(
-            aStr, eSearchType, bCaseSens, false, false, '~', bWildMatchSel);
+            aStr, eSearchType, bCaseSens, '~', bWildMatchSel);
         pSearchText = new utl::TextSearch( *pSearchParam, *ScGlobal::pCharClass );
     }
     return pSearchText;
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index bf563e705ea9..beb85c9d32be 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -148,7 +148,7 @@ namespace svxform
 #define TA( c )     &c, cppu::UnoType<decltype(c)>::get()
 
     FmSearchConfigItem::FmSearchConfigItem()
-        :OConfigurationValueContainer( ::comphelper::getProcessComponentContext(), m_aMutex, "/org.openoffice.Office.DataAccess/FormSearchOptions", CVCFlags::UPDATE_ACCESS | CVCFlags::LAZY_UPDATE, 2 )
+        :OConfigurationValueContainer( ::comphelper::getProcessComponentContext(), m_aMutex, "/org.openoffice.Office.DataAccess/FormSearchOptions", 2 )
     {
         // register our members so the data exchange with the node values is done automatically
 
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 7ec71c5e5e5b..7880722fb3d1 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -212,10 +212,10 @@ namespace utl
 
     OConfigurationValueContainer::OConfigurationValueContainer(
             const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety,
-            const sal_Char* _pConfigLocation, const CVCFlags _nAccessFlags, const sal_Int32 _nLevels )
+            const sal_Char* _pConfigLocation, const sal_Int32 _nLevels )
         :m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) )
     {
-        implConstruct( OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels );
+        implConstruct( OUString::createFromAscii( _pConfigLocation ), CVCFlags::UPDATE_ACCESS, _nLevels );
     }
 
     OConfigurationValueContainer::~OConfigurationValueContainer()
@@ -274,7 +274,7 @@ namespace utl
         );
     }
 
-    void OConfigurationValueContainer::write( bool _bCommit )
+    void OConfigurationValueContainer::write()
     {
         // collect the current values in the exchange locations
         std::for_each(
@@ -282,17 +282,13 @@ namespace utl
             m_pImpl->aAccessors.end(),
             UpdateToConfig( m_pImpl->aConfigRoot, m_pImpl->rMutex )
         );
-
-        // commit the changes done (if requested)
-        if ( _bCommit )
-            commit( false );
     }
 
     void OConfigurationValueContainer::commit( bool _bWrite )
     {
         // write the current values in the exchange locations (if requested)
         if ( _bWrite )
-            write( false );
+            write();
 
         // commit the changes done
         m_pImpl->aConfigRoot.commit( );
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 6a9ec1cc17fa..76cae71cfe20 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1361,8 +1361,7 @@ OUString LocaleDataWrapper::getTime( const tools::Time& rTime, bool bSec, bool b
 }
 
 OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal,
-        sal_Int16 nDisplayDayOfWeek, bool bDayOfMonthWithLeadingZero,
-        sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const
+        bool bTwoDigitYear ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
     using namespace css::i18n;
@@ -1373,15 +1372,15 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa
     rCal.setGregorianDateTime( rDate );
     // day of week
     nVal = rCal.getValue( CalendarFieldIndex::DAY_OF_WEEK );
-    aStr += rCal.getDisplayName( CalendarDisplayIndex::DAY, nVal, nDisplayDayOfWeek );
+    aStr += rCal.getDisplayName( CalendarDisplayIndex::DAY, nVal, 1 );
     aStr += getLongDateDayOfWeekSep();
     // day of month
     nVal = rCal.getValue( CalendarFieldIndex::DAY_OF_MONTH );
-    pBuf = ImplAdd2UNum( aBuf, nVal, bDayOfMonthWithLeadingZero );
+    pBuf = ImplAdd2UNum( aBuf, nVal, false/*bDayOfMonthWithLeadingZero*/ );
     OUString aDay(aBuf, pBuf-aBuf);
     // month of year
     nVal = rCal.getValue( CalendarFieldIndex::MONTH );
-    OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) );
+    OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, 1 ) );
     // year
     nVal = rCal.getValue( CalendarFieldIndex::YEAR );
     if ( bTwoDigitYear )
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 7e0d5a4ae3a8..f61ad1841039 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -40,8 +40,6 @@ namespace utl
 SearchParam::SearchParam( const OUString &rText,
                                 SearchType eType,
                                 bool bCaseSensitive,
-                                bool bWrdOnly,
-                                bool bSearchInSel,
                                 sal_uInt32 cWildEscChar,
                                 bool bWildMatchSel )
 {
@@ -50,8 +48,8 @@ SearchParam::SearchParam( const OUString &rText,
 
     m_cWildEscChar  = cWildEscChar;
 
-    m_bWordOnly     = bWrdOnly;
-    m_bSrchInSel    = bSearchInSel;
+    m_bWordOnly     = false;
+    m_bSrchInSel    = false;
     m_bCaseSense    = bCaseSensitive;
     m_bWildMatchSel = bWildMatchSel;
 
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 85ddad4d23a9..3ea665037357 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -63,20 +63,16 @@ MultiAtomProvider::~MultiAtomProvider()
         delete it->second;
 }
 
-int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate )
+int MultiAtomProvider::getAtom( int atomClass, const OUString& rString )
 {
     std::unordered_map<int, AtomProvider*>::iterator it =
           m_aAtomLists.find( atomClass );
     if( it != m_aAtomLists.end() )
-        return it->second->getAtom( rString, bCreate );
+        return it->second->getAtom( rString, true/*bCreate*/ );
 
-    if( bCreate )
-    {
-        AtomProvider* pNewClass;
-        m_aAtomLists[ atomClass ] = pNewClass = new AtomProvider();
-        return pNewClass->getAtom( rString, bCreate );
-    }
-    return INVALID_ATOM;
+    AtomProvider* pNewClass;
+    m_aAtomLists[ atomClass ] = pNewClass = new AtomProvider();
+    return pNewClass->getAtom( rString, true/*bCreate*/ );
 }
 
 const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 9188293474d3..7b7f255ce353 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1032,7 +1032,7 @@ class StarSymbolToMSMultiFontImpl : public StarSymbolToMSMultiFont
 private:
     ::std::multimap<sal_Unicode, SymbolEntry> maMagicMap;
 public:
-    explicit StarSymbolToMSMultiFontImpl(bool bPerfectOnly);
+    explicit StarSymbolToMSMultiFontImpl();
     OUString ConvertChar(sal_Unicode &rChar) override;
 };
 
@@ -1123,7 +1123,7 @@ ExtraTable aTNRExtraTab[] =
     {0xe0a9, '\\'}
 };
 
-StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl(bool bPerfectOnly)
+StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
 {
     struct ConvertTable
     {
@@ -1185,10 +1185,7 @@ StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl(bool bPerfectOnly)
     };
 
      //Allow extra conversions that are not perfect, but "good enough"
-    if (!bPerfectOnly)
-        nEntries = SAL_N_ELEMENTS(aAgressiveTable);
-    else
-        nEntries = 1;
+    nEntries = SAL_N_ELEMENTS(aAgressiveTable);
 
     for (i = 0; i < nEntries; ++i)
     {
@@ -1240,7 +1237,7 @@ OUString StarSymbolToMSMultiFontImpl::ConvertChar(sal_Unicode &rChar)
 
 StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont()
 {
-    return new StarSymbolToMSMultiFontImpl(false/*bPerfectOnly*/);
+    return new StarSymbolToMSMultiFontImpl;
 }
 
 sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index c2534f671ff7..a3b909cc4f45 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -328,13 +328,13 @@ TempFile::TempFile( const OUString* pParent, bool bDirectory )
     aName = CreateTempName_Impl( pParent, true, bDirectory );
 }
 
-TempFile::TempFile( const OUString& rLeadingChars, bool _bStartWithZero, const OUString* pExtension, const OUString* pParent, bool bDirectory)
+TempFile::TempFile( const OUString& rLeadingChars, bool _bStartWithZero, const OUString* pExtension, const OUString* pParent)
     : pStream( nullptr )
-    , bIsDirectory( bDirectory )
+    , bIsDirectory( false )
     , bKillingFileEnabled( false )
 {
     SequentialTokens t(_bStartWithZero);
-    aName = lcl_createName(rLeadingChars, t, pExtension, pParent, bDirectory, true, true);
+    aName = lcl_createName(rLeadingChars, t, pExtension, pParent, false/*bDirectory*/, true, true);
 }
 
 TempFile::~TempFile()
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index b08bd78814d7..24158a92a6e6 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1180,7 +1180,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate,
     {
         case XTDATEF_SYSTEM_LONG:
         {
-            return ImplGetLocaleDataWrapper().getLongDate( rDate, GetCalendarWrapper(), 1, false, 1, !bShowCentury );
+            return ImplGetLocaleDataWrapper().getLongDate( rDate, GetCalendarWrapper(), !bShowCentury );
         }
         case XTDATEF_SHORT_DDMMYY:
         case XTDATEF_SHORT_DDMMYYYY:
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 )
         {