callcatcher: update list, getXLFD is now unused

unusedcode.easy

@@ -4,6 +4,7 @@ AtomPubSession::getCollectionUrl(Collection::Type)
 ByteString::Assign(char const*, unsigned short)
 ByteString::Assign(char)
 ByteString::ByteString(char const*, unsigned short)
+ByteString::SetToken(unsigned short, char, ByteString const&, unsigned short)
 CIccCLUT::Interp3dTetra(float*, float const*)
 CIccCLUT::Iterate(IIccCLUTExec*)
 CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
@@ -471,13 +472,6 @@ SvPersistStream::InsertObj(SvPersistBase*)
 SvPersistStream::RemoveObj(SvPersistBase*)
 SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&)
 SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
-SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
-SvStringsISort::Insert(String* const&)
-SvStringsISort::Insert(String* const&, unsigned short&)
-SvStringsISort::Insert(String* const*, unsigned short)
-SvStringsISort::Insert(SvStringsISort const*, unsigned short, unsigned short)
-SvStringsISort::Remove(String* const&, unsigned short)
-SvStringsISort::Remove(unsigned short, unsigned short)
 SvStringsISortDtor::Insert(String* const*, unsigned short)
 SvTabListBox::GetTabJustify(unsigned short) const
 SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
@@ -1755,6 +1749,7 @@ pdfi::PDFIProcessor::sortDocument(bool)
 pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
 pdfparse::PDFReader::read(char const*, unsigned int)
 psp::GetCommandLineTokenCount(rtl::OString const&)
+psp::PrintFontManager::getXLFD(psp::PrintFontManager::PrintFont*) const
 psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
 psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
 psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)

vcl/generic/fontmanager/fontmanager.cxx

@@ -1734,82 +1734,6 @@ void PrintFontManager::getFontAttributesFromXLFD( PrintFont* pFont, const std::l
 
 // -------------------------------------------------------------------------
 
-OString PrintFontManager::getXLFD( PrintFont* pFont ) const
-{
-    if( pFont->m_eType == fonttype::Type1 )
-    {
-        if( static_cast<Type1FontFile*>(pFont)->m_aXLFD.getLength() )
-            return static_cast<Type1FontFile*>(pFont)->m_aXLFD;
-    }
-    if( pFont->m_eType == fonttype::TrueType )
-    {
-        if( static_cast<TrueTypeFontFile*>(pFont)->m_aXLFD.getLength() )
-            return static_cast<TrueTypeFontFile*>(pFont)->m_aXLFD;
-    }
-
-    OStringBuffer aXLFD( 128 );
-
-    aXLFD.append( "-misc-" );
-    ByteString aFamily(rtl::OUStringToOString(m_pAtoms->getString( ATOM_FAMILYNAME, pFont->m_nFamilyName ), RTL_TEXTENCODING_UTF8));
-    aFamily.SearchAndReplaceAll( '-',' ' );
-    aFamily.SearchAndReplaceAll( '?',' ' );
-    aFamily.SearchAndReplaceAll( '*',' ' );
-    aXLFD.append( OString( aFamily ) );
-    aXLFD.append( '-' );
-    switch( pFont->m_eWeight )
-    {
-        case WEIGHT_THIN:          aXLFD.append("thin");break;
-        case WEIGHT_ULTRALIGHT:    aXLFD.append("ultralight");break;
-        case WEIGHT_LIGHT:         aXLFD.append("light");break;
-        case WEIGHT_SEMILIGHT:     aXLFD.append("semilight");break;
-        case WEIGHT_NORMAL:        aXLFD.append("normal");break;
-        case WEIGHT_MEDIUM:        aXLFD.append("medium");break;
-        case WEIGHT_SEMIBOLD:      aXLFD.append("semibold");break;
-        case WEIGHT_BOLD:          aXLFD.append("bold");break;
-        case WEIGHT_ULTRABOLD:     aXLFD.append("ultrabold");break;
-        case WEIGHT_BLACK:         aXLFD.append("black");break;
-        default: break;
-    }
-    aXLFD.append('-');
-    switch( pFont->m_eItalic )
-    {
-        case ITALIC_NONE:       aXLFD.append('r');break;
-        case ITALIC_OBLIQUE:       aXLFD.append('o');break;
-        case ITALIC_NORMAL:        aXLFD.append('i');break;
-        default: break;
-    }
-    aXLFD.append('-');
-    switch( pFont->m_eWidth )
-    {
-        case WIDTH_ULTRA_CONDENSED: aXLFD.append("ultracondensed");break;
-        case WIDTH_EXTRA_CONDENSED: aXLFD.append("extracondensed");break;
-        case WIDTH_CONDENSED:       aXLFD.append("condensed");break;
-        case WIDTH_SEMI_CONDENSED:  aXLFD.append("semicondensed");break;
-        case WIDTH_NORMAL:          aXLFD.append("normal");break;
-        case WIDTH_SEMI_EXPANDED:   aXLFD.append("semiexpanded");break;
-        case WIDTH_EXPANDED:        aXLFD.append("expanded");break;
-        case WIDTH_EXTRA_EXPANDED:  aXLFD.append("extraexpanded");break;
-        case WIDTH_ULTRA_EXPANDED:  aXLFD.append("ultraexpanded");break;
-        default: break;
-    }
-    aXLFD.append("-utf8-0-0-0-0-");
-    aXLFD.append( pFont->m_ePitch == PITCH_FIXED ? "m" : "p" );
-    aXLFD.append("-0-");
-    const char* pEnc = rtl_getBestUnixCharsetFromTextEncoding( pFont->m_aEncoding );
-    if( ! pEnc )
-    {
-        if( pFont->m_aEncoding == RTL_TEXTENCODING_ADOBE_STANDARD )
-            pEnc = "adobe-standard";
-        else
-            pEnc = "iso8859-1";
-    }
-    aXLFD .append( pEnc );
-
-    return aXLFD.makeStringAndClear();
-}
-
-// -------------------------------------------------------------------------
-
 OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
 {
     NameRecord* pNameRecord = (NameRecord*)pRecord;

vcl/inc/vcl/fontmanager.hxx

@@ -359,7 +359,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
         it = m_aFonts.find( nID );
         return it == m_aFonts.end() ? NULL : it->second;
     }
-    rtl::OString getXLFD( PrintFont* pFont ) const;
     void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
     void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;