remove duplicate printer code

2 files changed, 11 insertions, 745 deletions

diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 10ce775318d0..841f589c2a39 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -169,144 +169,6 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     }
 }
 
-static bool passFileToCommandLine( const String& rFilename, const String& rCommandLine, bool bRemoveFile = true )
-{
-    bool bSuccess = false;
-
-    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-    ByteString aCmdLine( rCommandLine, aEncoding );
-    ByteString aFilename( rFilename, aEncoding );
-
-    bool bPipe = aCmdLine.Search( "(TMP)" ) != STRING_NOTFOUND ? false : true;
-
-    // setup command line for exec
-    if( ! bPipe )
-        while( aCmdLine.SearchAndReplace( "(TMP)", aFilename ) != STRING_NOTFOUND )
-            ;
-
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "%s commandline: \"%s\"\n",
-             bPipe ? "piping to" : "executing",
-             aCmdLine.GetBuffer() );
-    struct stat aStat;
-    if( stat( aFilename.GetBuffer(), &aStat ) )
-        fprintf( stderr, "stat( %s ) failed\n", aFilename.GetBuffer() );
-    fprintf( stderr, "Tmp file %s has modes: 0%03lo\n", aFilename.GetBuffer(), (long)aStat.st_mode );
-#endif
-    const char* argv[4];
-    if( ! ( argv[ 0 ] = getenv( "SHELL" ) ) )
-        argv[ 0 ] = "/bin/sh";
-    argv[ 1 ] = "-c";
-    argv[ 2 ] = aCmdLine.GetBuffer();
-    argv[ 3 ] = 0;
-
-    bool bHavePipes = false;
-    int pid, fd[2];
-
-    if( bPipe )
-        bHavePipes = pipe( fd ) ? false : true;
-    if( ( pid = fork() ) > 0 )
-    {
-        if( bPipe && bHavePipes )
-        {
-            close( fd[0] );
-            char aBuffer[ 2048 ];
-            FILE* fp = fopen( aFilename.GetBuffer(), "r" );
-            while( fp && ! feof( fp ) )
-            {
-                int nBytes = fread( aBuffer, 1, sizeof( aBuffer ), fp );
-                if( nBytes )
-                    write( fd[ 1 ], aBuffer, nBytes );
-            }
-            fclose( fp );
-            close( fd[ 1 ] );
-        }
-        int status = 0;
-        waitpid( pid, &status, 0 );
-        if( ! status )
-            bSuccess = true;
-    }
-    else if( ! pid )
-    {
-        if( bPipe && bHavePipes )
-        {
-            close( fd[1] );
-            if( fd[0] != STDIN_FILENO ) // not probable, but who knows :)
-                dup2( fd[0], STDIN_FILENO );
-        }
-        execv( argv[0], const_cast<char**>(argv) );
-        fprintf( stderr, "failed to execute \"%s\"\n", aCmdLine.GetBuffer() );
-        _exit( 1 );
-    }
-    else
-        fprintf( stderr, "failed to fork\n" );
-
-    // clean up the mess
-    if( bRemoveFile )
-        unlink( aFilename.GetBuffer() );
-
-    return bSuccess;
-}
-
-static bool sendAFax( const String& rFaxNumber, const String& rFileName, const String& rCommand )
-{
-    std::list< OUString > aFaxNumbers;
-
-    if( ! rFaxNumber.Len() )
-        return false;
-
-    sal_Int32 nIndex = 0;
-    OUString aFaxes( rFaxNumber );
-    OUString aBeginToken( RTL_CONSTASCII_USTRINGPARAM("<Fax#>") );
-    OUString aEndToken( RTL_CONSTASCII_USTRINGPARAM("</Fax#>") );
-    while( nIndex != -1 )
-    {
-        nIndex = aFaxes.indexOf( aBeginToken, nIndex );
-        if( nIndex != -1 )
-        {
-            sal_Int32 nBegin = nIndex + aBeginToken.getLength();
-            nIndex = aFaxes.indexOf( aEndToken, nIndex );
-            if( nIndex != -1 )
-            {
-                aFaxNumbers.push_back( aFaxes.copy( nBegin, nIndex-nBegin ) );
-                nIndex += aEndToken.getLength();
-            }
-        }
-    }
-
-    bool bSuccess = true;
-    if( aFaxNumbers.begin() != aFaxNumbers.end() )
-    {
-        while( aFaxNumbers.begin() != aFaxNumbers.end() && bSuccess )
-        {
-            String aCmdLine( rCommand );
-            String aFaxNumber( aFaxNumbers.front() );
-            aFaxNumbers.pop_front();
-            while( aCmdLine.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "(PHONE)" ) ), aFaxNumber ) != STRING_NOTFOUND )
-                ;
-#if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "sending fax to \"%s\"\n", OUStringToOString( aFaxNumber, osl_getThreadTextEncoding() ).getStr() );
-#endif
-            bSuccess = passFileToCommandLine( rFileName, aCmdLine, false );
-        }
-    }
-    else
-        bSuccess = false;
-
-    // clean up temp file
-    unlink( ByteString( rFileName, osl_getThreadTextEncoding() ).GetBuffer() );
-
-    return bSuccess;
-}
-
-static bool createPdf( const String& rToFile, const String& rFromFile, const String& rCommandLine )
-{
-    String aCommandLine( rCommandLine );
-    while( aCommandLine.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "(OUTFILE)" ) ), rToFile ) != STRING_NOTFOUND )
-        ;
-    return passFileToCommandLine( rFromFile, aCommandLine );
-}
-
 /*
  *  SalInstance
  */
@@ -436,87 +298,6 @@ String SvpSalInstance::GetDefaultPrinter()
     return rManager.getDefaultPrinter();
 }
 
-// =======================================================================
-
-SvpSalInfoPrinter::SvpSalInfoPrinter()
-{
-    m_pGraphics = NULL;
-    m_bPapersInit = false;
-}
-
-// -----------------------------------------------------------------------
-
-SvpSalInfoPrinter::~SvpSalInfoPrinter()
-{
-    if( m_pGraphics )
-    {
-        delete m_pGraphics;
-        m_pGraphics = NULL;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void SvpSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
-{
-    m_aPaperFormats.clear();
-    m_bPapersInit = true;
-
-    if( m_aJobData.m_pParser )
-    {
-        const PPDKey* pKey = m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-        if( pKey )
-        {
-            int nValues = pKey->countValues();
-            for( int i = 0; i < nValues; i++ )
-            {
-                const PPDValue* pValue = pKey->getValue( i );
-                int nWidth = 0, nHeight = 0;
-                m_aJobData.m_pParser->getPaperDimension( pValue->m_aOption, nWidth, nHeight );
-                PaperInfo aInfo(PtTo10Mu( nWidth ), PtTo10Mu( nHeight ));
-                m_aPaperFormats.push_back( aInfo );
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-int SvpSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
-{
-    return 900;
-}
-
-// -----------------------------------------------------------------------
-
-SalGraphics* SvpSalInfoPrinter::GetGraphics()
-{
-    // return a valid pointer only once
-    // the reasoning behind this is that we could have different
-    // SalGraphics that can run in multiple threads
-    // (future plans)
-    SalGraphics* pRet = NULL;
-    if( ! m_pGraphics )
-    {
-        m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, NULL, false, this );
-        m_pGraphics->SetLayout( 0 );
-        pRet = m_pGraphics;
-    }
-    return pRet;
-}
-
-// -----------------------------------------------------------------------
-
-void SvpSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
-{
-    if( pGraphics == m_pGraphics )
-    {
-        delete pGraphics;
-        m_pGraphics = NULL;
-    }
-    return;
-}
-
 // -----------------------------------------------------------------------
 
 BOOL SvpSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
@@ -524,478 +305,6 @@ BOOL SvpSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
-
-// This function gets the driver data and puts it into pJobSetup
-// If pJobSetup->mpDriverData is NOT NULL, then the independend
-// data should be merged into the driver data
-// If pJobSetup->mpDriverData IS NULL, then the driver defaults
-// should be merged into the independent data
-BOOL SvpSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
-{
-    if( pJobSetup->mpDriverData )
-        return SetData( ~0, pJobSetup );
-
-    copyJobDataToJobSetup( pJobSetup, m_aJobData );
-
-    // set/clear backwards compatibility flag
-    bool bStrictSO52Compatibility = false;
-    std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it =
-        pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) );
-    if( compat_it != pJobSetup->maValueMap.end() )
-    {
-        if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) )
-            bStrictSO52Compatibility = true;
-    }
-    m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
-
-    return TRUE;
-}
-
-// -----------------------------------------------------------------------
-
-// This function merges the independ driver data
-// and sets the new independ data in pJobSetup
-// Only the data must be changed, where the bit
-// in nGetDataFlags is set
-BOOL SvpSalInfoPrinter::SetData(
-    ULONG nSetDataFlags,
-    ImplJobSetup* pJobSetup )
-{
-    JobData aData;
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-
-    if( aData.m_pParser )
-    {
-        const PPDKey* pKey;
-        const PPDValue* pValue;
-
-        // merge papersize if necessary
-        if( nSetDataFlags & SAL_JOBSET_PAPERSIZE )
-        {
-            int nWidth, nHeight;
-            if( pJobSetup->meOrientation == ORIENTATION_PORTRAIT )
-            {
-                nWidth  = pJobSetup->mnPaperWidth;
-                nHeight = pJobSetup->mnPaperHeight;
-            }
-            else
-            {
-                nWidth  = pJobSetup->mnPaperHeight;
-                nHeight = pJobSetup->mnPaperWidth;
-            }
-            String aPaper;
-
-            if( pJobSetup->mePaperFormat == PAPER_USER )
-                aPaper = aData.m_pParser->matchPaper(
-                    TenMuToPt( pJobSetup->mnPaperWidth ),
-                    TenMuToPt( pJobSetup->mnPaperHeight ) );
-            else
-                aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1);
-
-            pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-            pValue = pKey ? pKey->getValue( aPaper ) : NULL;
-            if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
-                return FALSE;
-        }
-
-        // merge paperbin if necessary
-        if( nSetDataFlags & SAL_JOBSET_PAPERBIN )
-        {
-            pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
-            if( pKey )
-            {
-                int nPaperBin = pJobSetup->mnPaperBin;
-                if( nPaperBin == 0xffff )
-                    pValue = pKey->getDefaultValue();
-                else
-                    pValue = pKey->getValue( pJobSetup->mnPaperBin );
-
-                // may fail due to constraints;
-                // real paper bin is copied back to jobsetup in that case
-                aData.m_aContext.setValue( pKey, pValue );
-            }
-            // if printer has no InputSlot key simply ignore this setting
-            // (e.g. SGENPRT has no InputSlot)
-        }
-
-        // merge orientation if necessary
-        if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
-            aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
-
-        // merge duplex if necessary
-        if( nSetDataFlags & SAL_JOBSET_DUPLEXMODE )
-        {
-            pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
-            if( pKey )
-            {
-                pValue = NULL;
-                switch( pJobSetup->meDuplexMode )
-                {
-                case DUPLEX_OFF:
-                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
-                    if( pValue == NULL )
-                        pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "SimplexNoTumble" ) ) );
-                    break;
-                case DUPLEX_SHORTEDGE:
-                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexTumble" ) ) );
-                    break;
-                case DUPLEX_LONGEDGE:
-                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexNoTumble" ) ) );
-                    break;
-                case DUPLEX_UNKNOWN:
-                default:
-                    pValue = 0;
-                    break;
-                }
-                if( ! pValue )
-                    pValue = pKey->getDefaultValue();
-                aData.m_aContext.setValue( pKey, pValue );
-            }
-        }
-
-        m_aJobData = aData;
-        copyJobDataToJobSetup( pJobSetup, aData );
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-// -----------------------------------------------------------------------
-
-void SvpSalInfoPrinter::GetPageInfo(
-    const ImplJobSetup* pJobSetup,
-    long& rOutWidth, long& rOutHeight,
-    long& rPageOffX, long& rPageOffY,
-    long& rPageWidth, long& rPageHeight )
-{
-    if( ! pJobSetup )
-        return;
-
-    JobData aData;
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-
-    // get the selected page size
-    if( aData.m_pParser )
-    {
-
-        String aPaper;
-        int width, height;
-        int left = 0, top = 0, right = 0, bottom = 0;
-        int nDPI = aData.m_aContext.getRenderResolution();
-
-
-        if( aData.m_eOrientation == psp::orientation::Portrait )
-        {
-            aData.m_aContext.getPageSize( aPaper, width, height );
-            aData.m_pParser->getMargins( aPaper, left, right, top, bottom );
-        }
-        else
-        {
-            aData.m_aContext.getPageSize( aPaper, height, width );
-            aData.m_pParser->getMargins( aPaper, top, bottom, right, left );
-        }
-
-        rPageWidth  = width * nDPI / 72;
-        rPageHeight = height * nDPI / 72;
-        rPageOffX   = left * nDPI / 72;
-        rPageOffY   = top * nDPI / 72;
-        rOutWidth   = ( width  - left - right ) * nDPI / 72;
-        rOutHeight  = ( height - top  - bottom ) * nDPI / 72;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-ULONG SvpSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
-{
-    if( ! pJobSetup )
-        return 0;
-
-    JobData aData;
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-
-    const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-    return pKey ? pKey->countValues() : 0;
-}
-
-// -----------------------------------------------------------------------
-
-String SvpSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG nPaperBin )
-{
-    JobData aData;
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-
-    String aRet;
-    if( aData.m_pParser )
-    {
-        const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-        if( nPaperBin == 0xffff || ! pKey )
-            aRet = aData.m_pParser->getDefaultInputSlot();
-        else
-        {
-            const PPDValue* pValue = pKey->getValue( nPaperBin );
-            if( pValue )
-                aRet = aData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption );
-        }
-    }
-
-    return aRet;
-}
-
-// -----------------------------------------------------------------------
-
-ULONG SvpSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT nType )
-{
-    switch( nType )
-    {
-        case PRINTER_CAPABILITIES_SUPPORTDIALOG:
-            return 1;
-        case PRINTER_CAPABILITIES_COPIES:
-            return 0xffff;
-        case PRINTER_CAPABILITIES_COLLATECOPIES:
-        {
-            // see if the PPD contains a value to set Collate to True
-            JobData aData;
-            JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-
-            const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) ) : NULL;
-            const PPDValue* pVal = pKey ? pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "True" ) ) ) : NULL;
-
-            // PPDs don't mention the number of possible collated copies.
-            // so let's guess as many as we want ?
-            return pVal ? 0xffff : 0;
-        }
-        case PRINTER_CAPABILITIES_SETORIENTATION:
-            return 1;
-        case PRINTER_CAPABILITIES_SETDUPLEX:
-            return 1;
-        case PRINTER_CAPABILITIES_SETPAPERBIN:
-            return 1;
-        case PRINTER_CAPABILITIES_SETPAPERSIZE:
-            return 1;
-        case PRINTER_CAPABILITIES_SETPAPER:
-            return 0;
-        case PRINTER_CAPABILITIES_FAX:
-        {
-            PrinterInfoManager& rManager = PrinterInfoManager::get();
-            PrinterInfo aInfo( rManager.getPrinterInfo( pJobSetup->maPrinterName ) );
-            String aFeatures( aInfo.m_aFeatures );
-            int nTokenCount = aFeatures.GetTokenCount( ',' );
-            for( int i = 0; i < nTokenCount; i++ )
-            {
-                if( aFeatures.GetToken( i ).CompareToAscii( "fax", 3 ) == COMPARE_EQUAL )
-                    return 1;
-            }
-            return 0;
-        }
-        case PRINTER_CAPABILITIES_PDF:
-        {
-            PrinterInfoManager& rManager = PrinterInfoManager::get();
-            PrinterInfo aInfo( rManager.getPrinterInfo( pJobSetup->maPrinterName ) );
-            String aFeatures( aInfo.m_aFeatures );
-            int nTokenCount = aFeatures.GetTokenCount( ',' );
-            for( int i = 0; i < nTokenCount; i++ )
-            {
-                if( aFeatures.GetToken( i ).CompareToAscii( "pdf=", 4 ) == COMPARE_EQUAL )
-                    return 1;
-            }
-            return 0;
-        }
-        default: break;
-    };
-    return 0;
-}
-
-// =======================================================================
-
-/*
- *  SalPrinter
- */
-
-SvpSalPrinter::SvpSalPrinter( SalInfoPrinter* pInfoPrinter )
- : m_bFax( false ),
-   m_bPdf( false ),
-   m_bSwallowFaxNo( false ),
-   m_pGraphics( NULL ),
-   m_nCopies( 1 ),
-   m_bCollate( false ),
-   m_pInfoPrinter( pInfoPrinter )
-{
-}
-
-// -----------------------------------------------------------------------
-
-SvpSalPrinter::~SvpSalPrinter()
-{
-}
-
-// -----------------------------------------------------------------------
-
-static String getTmpName()
-{
-    rtl::OUString aTmp, aSys;
-    osl_createTempFile( NULL, NULL, &aTmp.pData );
-    osl_getSystemPathFromFileURL( aTmp.pData, &aSys.pData );
-
-    return aSys;
-}
-
-BOOL SvpSalPrinter::StartJob(
-    const XubString* pFileName,
-    const XubString& rJobName,
-    const XubString& rAppName,
-    ULONG nCopies,
-    bool bCollate,
-    bool /*bDirect*/,
-    ImplJobSetup* pJobSetup )
-{
-    SvpSalInstance::s_pDefaultInstance->jobStartedPrinterUpdate();
-
-    m_bFax      = false;
-    m_bPdf      = false;
-    m_aFileName = pFileName ? *pFileName : String();
-    m_aTmpFile  = String();
-    m_nCopies   = nCopies;
-    m_bCollate  = bCollate;
-
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
-    if( m_nCopies > 1 )
-    {
-        // in case user did not do anything (m_nCopies=1)
-        // take the default from jobsetup
-        m_aJobData.m_nCopies = m_nCopies;
-        m_aJobData.setCollate( bCollate );
-    }
-
-    // check wether this printer is configured as fax
-    int nMode = 0;
-    const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( m_aJobData.m_aPrinterName ) );
-    sal_Int32 nIndex = 0;
-    while( nIndex != -1 )
-    {
-        OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
-        if( ! aToken.compareToAscii( "fax", 3 ) )
-        {
-            m_bFax = true;
-            m_aTmpFile = getTmpName();
-            nMode = S_IRUSR | S_IWUSR;
-
-            ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
-            it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) );
-            if( it != pJobSetup->maValueMap.end() )
-                m_aFaxNr = it->second;
-
-            sal_Int32 nPos = 0;
-            m_bSwallowFaxNo = ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? true : false;
-
-            break;
-        }
-        if( ! aToken.compareToAscii( "pdf=", 4 ) )
-        {
-            m_bPdf = true;
-            m_aTmpFile = getTmpName();
-            nMode = S_IRUSR | S_IWUSR;
-
-            if( ! m_aFileName.Len() )
-            {
-                m_aFileName = getPdfDir( rInfo );
-                m_aFileName.Append( '/' );
-                m_aFileName.Append( rJobName );
-                m_aFileName.AppendAscii( ".pdf" );
-            }
-            break;
-        }
-    }
-    m_aPrinterGfx.Init( m_aJobData );
-
-    // set/clear backwards compatibility flag
-    bool bStrictSO52Compatibility = false;
-    std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it =
-        pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) );
-    if( compat_it != pJobSetup->maValueMap.end() )
-    {
-        if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) )
-            bStrictSO52Compatibility = true;
-    }
-    m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
-
-    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, false ) ? TRUE : FALSE;
-}
-
-// -----------------------------------------------------------------------
-
-BOOL SvpSalPrinter::EndJob()
-{
-    BOOL bSuccess = m_aPrintJob.EndJob();
-
-    if( bSuccess )
-    {
-        // check for fax
-        if( m_bFax )
-        {
-
-            const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( m_aJobData.m_aPrinterName ) );
-            // sendAFax removes the file after use
-            bSuccess = sendAFax( m_aFaxNr, m_aTmpFile, rInfo.m_aCommand );
-        }
-        else if( m_bPdf )
-        {
-            const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( m_aJobData.m_aPrinterName ) );
-            bSuccess = createPdf( m_aFileName, m_aTmpFile, rInfo.m_aCommand );
-        }
-    }
-    SvpSalInstance::s_pDefaultInstance->jobEndedPrinterUpdate();
-    return bSuccess;
-}
-
-// -----------------------------------------------------------------------
-
-BOOL SvpSalPrinter::AbortJob()
-{
-    BOOL bAbort = m_aPrintJob.AbortJob() ? TRUE : FALSE;
-    SvpSalInstance::s_pDefaultInstance->jobEndedPrinterUpdate();
-    return bAbort;
-}
-
-// -----------------------------------------------------------------------
-
-SalGraphics* SvpSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
-{
-    JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
-    m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, m_bFax ? &m_aFaxNr : NULL, m_bSwallowFaxNo, m_pInfoPrinter  );
-    m_pGraphics->SetLayout( 0 );
-    if( m_nCopies > 1 )
-    {
-        // in case user did not do anything (m_nCopies=1)
-        // take the default from jobsetup
-        m_aJobData.m_nCopies = m_nCopies;
-        m_aJobData.setCollate( m_nCopies > 1 && m_bCollate );
-    }
-
-    m_aPrintJob.StartPage( m_aJobData );
-    m_aPrinterGfx.Init( m_aPrintJob );
-
-    return m_pGraphics;
-}
-
-// -----------------------------------------------------------------------
-
-BOOL SvpSalPrinter::EndPage()
-{
-    sal_Bool bResult = m_aPrintJob.EndPage();
-    m_aPrinterGfx.Clear();
-    return bResult ? TRUE : FALSE;
-}
-
-// -----------------------------------------------------------------------
-
-ULONG SvpSalPrinter::GetErrorCode()
-{
-    return 0;
-}
-
 /*
  *  svp::PrinterUpdate
  */
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index b2fa653314b8..17a1d32915d9 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -33,70 +33,27 @@
 #include "vcl/printergfx.hxx"
 #include "vcl/printerjob.hxx"
 #include "vcl/salprn.hxx"
+#include "salprn.h"
 
 class PspGraphics;
 
-class SvpSalInfoPrinter : public SalInfoPrinter
+class SvpSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
-    PspGraphics*            m_pGraphics;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
-
-    SvpSalInfoPrinter();
-    virtual ~SvpSalInfoPrinter();
-
-    // overload all pure virtual methods
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
     virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
-                                                 long& rOutWidth, long& rOutHeight,
-                                                 long& rPageOffX, long& rPageOffY,
-                                                 long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
-class SvpSalPrinter : public SalPrinter
+class SvpSalPrinter : public PspSalPrinter
 {
 public:
-    String                  m_aFileName;
-    String                  m_aTmpFile;
-    String                  m_aFaxNr;
-    bool                    m_bFax:1;
-    bool                    m_bPdf:1;
-    bool                    m_bSwallowFaxNo:1;
-    PspGraphics*            m_pGraphics;
-    psp::PrinterJob         m_aPrintJob;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
-    ULONG                   m_nCopies;
-    bool                    m_bCollate;
-    SalInfoPrinter*         m_pInfoPrinter;
-
-    SvpSalPrinter( SalInfoPrinter* );
-    virtual ~SvpSalPrinter();
-
-    // overload all pure virtual methods
-    using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
-                                              const XubString& rJobName,
-                                              const XubString& rAppName,
-                                              ULONG nCopies,
-                                              bool bCollate,
-                                              bool bDirect,
-                                              ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    SvpSalPrinter( SalInfoPrinter* pInfoPrinter ) : PspSalPrinter(pInfoPrinter) {}
+
+    virtual BOOL StartJob( const XubString* pFileName, const XubString& rJobName,
+                           const XubString& rAppName, ULONG nCopies, bool bCollate,
+                           bool /*bDirect*/, ImplJobSetup* pSetupData )
+    {
+        return SvpSalPrinter::StartJob( pFileName, rJobName, rAppName, nCopies, bCollate, false, pSetupData );
+    }
 };
 
 #endif // _SVP_SVPPRN_HXX