remove 'add a fax printer' from padmin

Support for passing the phone number through to fax4CUPS is now implemented so
that's now the recommended route for adding fax printers.

Change-Id: I3cc9d4f4295610b322cd738343bd9bbfadeb431e

10 files changed, 12 insertions, 337 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 8374c19f068e..2368a7303bc2 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -49,18 +49,15 @@ APTabPage::APTabPage( AddPrinterDialog* pParent, const ResId& rResId )
 APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
         APTabPage( pParent, PaResId( RID_ADDP_PAGE_CHOOSEDEV ) ),
         m_aPrinterBtn( this, PaResId( RID_ADDP_CHDEV_BTN_PRINTER ) ),
-        m_aFaxBtn( this, PaResId( RID_ADDP_CHDEV_BTN_FAX ) ),
         m_aPDFBtn( this, PaResId( RID_ADDP_CHDEV_BTN_PDF ) ),
         m_aOverTxt( this, PaResId( RID_ADDP_CHDEV_TXT_OVER ) )
 {
     FreeResource();
     m_aPrinterBtn.Check( true );
-    m_aFaxBtn.Check( false );
     m_aPDFBtn.Check( false );
     if( ! PrinterInfoManager::get().addOrRemovePossible() )
     {
         m_aPrinterBtn.Check( false );
-        m_aFaxBtn.Check( true );
         m_aPrinterBtn.Enable( false );
     }
 }
@@ -80,16 +77,10 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo )
     {
         rInfo.m_aFeatures = "pdf=";
     }
-    else if( m_aFaxBtn.IsChecked() )
-    {
-        rInfo.m_aFeatures = "fax";
-    }
     else
         rInfo.m_aFeatures = "";
 }
 
-
-
 APChooseDriverPage::APChooseDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_CHOOSEDRIVER ) ),
           m_aDriverTxt( this, PaResId( RID_ADDP_CHDRV_TXT_DRIVER ) ),
@@ -306,31 +297,25 @@ APNamePage::APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, De
           m_aNameTxt(
                      this,
                      PaResId(
-                             eKind == DeviceKind::Printer ? RID_ADDP_NAME_TXT_NAME :
-                             eKind == DeviceKind::Fax ? RID_ADDP_NAME_TXT_FAXNAME : RID_ADDP_NAME_TXT_PDFNAME
+                             eKind == DeviceKind::Printer ? RID_ADDP_NAME_TXT_NAME : RID_ADDP_NAME_TXT_PDFNAME
                              )
                      ),
           m_aNameEdt(
                      this,
                      PaResId(
-                             eKind == DeviceKind::Printer ? RID_ADDP_NAME_EDT_NAME :
-                             eKind == DeviceKind::Fax ? RID_ADDP_NAME_EDT_FAXNAME : RID_ADDP_NAME_EDT_PDFNAME
+                             eKind == DeviceKind::Printer ? RID_ADDP_NAME_EDT_NAME : RID_ADDP_NAME_EDT_PDFNAME
                              )
                      ),
-          m_aDefaultBox( this, PaResId( RID_ADDP_NAME_BOX_DEFAULT ) ),
-          m_aFaxSwallowBox( this, PaResId( RID_ADDP_NAME_BOX_FAXSWALLOW ) )
+          m_aDefaultBox( this, PaResId( RID_ADDP_NAME_BOX_DEFAULT ) )
 {
     FreeResource();
     if( eKind != DeviceKind::Printer )
         m_aDefaultBox.Show( false );
     else
         m_aNameEdt.SetText( rInitName );
-    if( eKind != DeviceKind::Fax )
-        m_aFaxSwallowBox.Show( false );
 
     m_aNameEdt.SetText( AddPrinterDialog::uniquePrinterName( m_aNameEdt.GetText() ) );
     m_aDefaultBox.Check( false );
-    m_aFaxSwallowBox.Check( false );
 }
 
 APNamePage::~APNamePage()
@@ -354,7 +339,7 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
           m_aCommandTxt( this, PaResId( RID_ADDP_CMD_TXT_COMMAND ) ),
           m_aCommandBox( this, PaResId( eKind == DeviceKind::Pdf ? RID_ADDP_CMD_BOX_PDFCOMMAND : RID_ADDP_CMD_BOX_COMMAND ) ),
           m_aHelpBtn( this, PaResId( RID_ADDP_CMD_BTN_HELP ) ),
-          m_aHelpTxt( PaResId( eKind == DeviceKind::Fax ? RID_ADDP_CMD_STR_FAXHELP : RID_ADDP_CMD_STR_PDFHELP ) ),
+          m_aHelpTxt( PaResId( RID_ADDP_CMD_STR_PDFHELP ) ),
           m_aPdfDirTxt( this, PaResId( RID_ADDP_CMD_TXT_PDFDIR ) ),
           m_aPdfDirEdt( this, PaResId( RID_ADDP_CMD_EDT_PDFDIR ) ),
           m_aPdfDirBtn( this, PaResId( RID_ADDP_CMD_BTN_PDFDIR ) ),
@@ -378,7 +363,6 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
     switch( m_eKind )
     {
         case DeviceKind::Printer:   CommandStore::getPrintCommands( aCommands );break;
-        case DeviceKind::Fax:       CommandStore::getFaxCommands( aCommands );break;
         case DeviceKind::Pdf:       CommandStore::getPdfCommands( aCommands );break;
     }
     // adjust height of command text and help button
@@ -423,7 +407,6 @@ APCommandPage::~APCommandPage()
     switch( m_eKind )
     {
         case DeviceKind::Printer:   CommandStore::setPrintCommands( aCommands );break;
-        case DeviceKind::Fax:       CommandStore::setFaxCommands( aCommands );break;
         case DeviceKind::Pdf:       CommandStore::setPdfCommands( aCommands );break;
     }
 }
@@ -463,38 +446,6 @@ void APCommandPage::fill( PrinterInfo& rInfo )
     rInfo.m_aCommand = m_aCommandBox.GetText();
 }
 
-APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent )
-        : APTabPage( pParent, PaResId( RID_ADDP_PAGE_FAXDRIVER ) ),
-          m_aFaxTxt( this, PaResId( RID_ADDP_FAXDRV_TXT_DRIVER ) ),
-          m_aDefBtn( this, PaResId( RID_ADDP_FAXDRV_BTN_DEFAULT ) ),
-          m_aSelectBtn( this, PaResId( RID_ADDP_FAXDRV_BTN_SELECT ) )
-{
-    FreeResource();
-
-    m_aDefBtn.Check( true );
-    m_aSelectBtn.Check( false );
-    m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK );
-}
-
-APFaxDriverPage::~APFaxDriverPage()
-{
-}
-
-bool APFaxDriverPage::check()
-{
-    return true;
-}
-
-void APFaxDriverPage::fill( PrinterInfo& rInfo )
-{
-    if( isDefault() )
-    {
-        rInfo.m_aDriverName = "SGENPRT";
-    }
-}
-
-
-
 APPdfDriverPage::APPdfDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_PDFDRIVER ) ),
           m_aPdfTxt( this, PaResId( RID_ADDP_PDFDRV_TXT_DRIVER ) ),
@@ -542,10 +493,6 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
           m_pCommandPage( NULL ),
           m_pChooseDriverPage( NULL ),
           m_pNamePage( NULL ),
-          m_pFaxDriverPage( NULL ),
-          m_pFaxSelectDriverPage( NULL ),
-          m_pFaxNamePage( NULL ),
-          m_pFaxCommandPage( NULL ),
           m_pPdfDriverPage( NULL ),
           m_pPdfSelectDriverPage( NULL ),
           m_pPdfNamePage( NULL ),
@@ -573,10 +520,6 @@ AddPrinterDialog::~AddPrinterDialog()
     delete m_pChooseDriverPage;
     delete m_pNamePage;
     delete m_pCommandPage;
-    delete m_pFaxDriverPage;
-    delete m_pFaxSelectDriverPage;
-    delete m_pFaxCommandPage;
-    delete m_pFaxNamePage;
     delete m_pPdfDriverPage;
     delete m_pPdfSelectDriverPage;
     delete m_pPdfNamePage;
@@ -610,13 +553,6 @@ void AddPrinterDialog::advance()
             m_pCurrentPage = m_pChooseDriverPage;
             m_aPrevPB.Enable( true );
         }
-        else if( m_pChooseDevicePage->isFax() )
-        {
-            if( ! m_pFaxDriverPage )
-                m_pFaxDriverPage = new APFaxDriverPage( this );
-            m_pCurrentPage = m_pFaxDriverPage;
-            m_aPrevPB.Enable( true );
-        }
         else if( m_pChooseDevicePage->isPDF() )
         {
             if( ! m_pPdfDriverPage )
@@ -641,35 +577,6 @@ void AddPrinterDialog::advance()
         m_aFinishPB.Enable( true );
         m_aNextPB.Enable( false );
     }
-    else if( m_pCurrentPage == m_pFaxDriverPage )
-    {
-        if( ! m_pFaxDriverPage->isDefault() )
-        {
-            if( ! m_pFaxSelectDriverPage )
-                m_pFaxSelectDriverPage = new APChooseDriverPage( this );
-            m_pCurrentPage = m_pFaxSelectDriverPage;
-        }
-        else
-        {
-            if( ! m_pFaxCommandPage )
-                m_pFaxCommandPage = new APCommandPage( this, DeviceKind::Fax );
-            m_pCurrentPage = m_pFaxCommandPage;
-        }
-    }
-    else if( m_pCurrentPage == m_pFaxSelectDriverPage )
-    {
-        if( ! m_pFaxCommandPage )
-            m_pFaxCommandPage = new APCommandPage( this, DeviceKind::Fax );
-        m_pCurrentPage = m_pFaxCommandPage;
-    }
-    else if( m_pCurrentPage == m_pFaxCommandPage )
-    {
-        if( ! m_pFaxNamePage )
-            m_pFaxNamePage = new APNamePage( this, OUString(), DeviceKind::Fax );
-        m_pCurrentPage = m_pFaxNamePage;
-        m_aNextPB.Enable( false );
-        m_aFinishPB.Enable( true );
-    }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
         if( ! m_pPdfDriverPage->isDefault() && ! m_pPdfDriverPage->isDist() )
@@ -721,25 +628,6 @@ void AddPrinterDialog::back()
     {
         m_pCurrentPage = m_pChooseDriverPage;
     }
-    else if( m_pCurrentPage == m_pFaxDriverPage )
-    {
-        m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( false );
-    }
-    else if( m_pCurrentPage == m_pFaxSelectDriverPage )
-    {
-        m_pCurrentPage = m_pFaxDriverPage;
-    }
-    else if( m_pCurrentPage == m_pFaxNamePage )
-    {
-        m_pCurrentPage = m_pFaxCommandPage;
-        m_aNextPB.Enable( true );
-    }
-    else if( m_pCurrentPage == m_pFaxCommandPage )
-    {
-        m_pCurrentPage = m_pFaxDriverPage->isDefault() ? (APTabPage*)m_pFaxDriverPage : (APTabPage*)m_pFaxSelectDriverPage;
-        m_aNextPB.Enable( true );
-    }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
@@ -776,12 +664,6 @@ void AddPrinterDialog::addPrinter()
             if( m_pNamePage->isDefault() )
                 rManager.setDefaultPrinter( m_aPrinter.m_aPrinterName );
         }
-        else if( m_pChooseDevicePage->isFax() )
-        {
-            aInfo.m_aFeatures = "fax=";
-            if( m_pFaxNamePage->isFaxSwallow() )
-                aInfo.m_aFeatures += "swallow";
-        }
         else if( m_pChooseDevicePage->isPDF() )
         {
             OUString aPdf( "pdf=" );
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index a8f3c1dd2472..486b19da0a29 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -35,7 +35,7 @@ namespace padmin
 
 class AddPrinterDialog;
 
-namespace DeviceKind { enum type { Printer, Fax, Pdf }; }
+namespace DeviceKind { enum type { Printer, Pdf }; }
 
 class APTabPage : public TabPage
 {
@@ -54,7 +54,6 @@ public:
 class APChooseDevicePage : public APTabPage
 {
     RadioButton             m_aPrinterBtn;
-    RadioButton             m_aFaxBtn;
     RadioButton             m_aPDFBtn;
     FixedText               m_aOverTxt;
 public:
@@ -62,7 +61,6 @@ public:
     ~APChooseDevicePage();
 
     bool isPrinter() { return m_aPrinterBtn.IsChecked(); }
-    bool isFax() { return m_aFaxBtn.IsChecked(); }
     bool isPDF() { return m_aPDFBtn.IsChecked(); }
 
     virtual bool check();
@@ -96,13 +94,11 @@ class APNamePage : public APTabPage
     FixedText               m_aNameTxt;
     Edit                    m_aNameEdt;
     CheckBox                m_aDefaultBox;
-    CheckBox                m_aFaxSwallowBox;
 public:
     APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, DeviceKind::type eKind );
     ~APNamePage();
 
     bool isDefault() { return m_aDefaultBox.IsChecked(); }
-    bool isFaxSwallow() { return m_aFaxSwallowBox.IsChecked(); }
 
     void setText( const OUString& rText ) { m_aNameEdt.SetText( rText ); }
 
@@ -154,21 +150,6 @@ public:
     void addOldPrinters();
 };
 
-class APFaxDriverPage : public APTabPage
-{
-    FixedText               m_aFaxTxt;
-    RadioButton             m_aDefBtn;
-    RadioButton             m_aSelectBtn;
-public:
-    APFaxDriverPage( AddPrinterDialog* pParent );
-    ~APFaxDriverPage();
-
-    virtual bool check();
-    virtual void fill( ::psp::PrinterInfo& rInfo );
-
-    bool isDefault() { return m_aDefBtn.IsChecked(); }
-};
-
 class APPdfDriverPage : public APTabPage
 {
     FixedText               m_aPdfTxt;
@@ -203,10 +184,6 @@ class AddPrinterDialog : public ModalDialog
     APCommandPage*          m_pCommandPage;
     APChooseDriverPage*     m_pChooseDriverPage;
     APNamePage*             m_pNamePage;
-    APFaxDriverPage*        m_pFaxDriverPage;
-    APChooseDriverPage*     m_pFaxSelectDriverPage;
-    APNamePage*             m_pFaxNamePage;
-    APCommandPage*          m_pFaxCommandPage;
     APPdfDriverPage*        m_pPdfDriverPage;
     APChooseDriverPage*     m_pPdfSelectDriverPage;
     APNamePage*             m_pPdfNamePage;
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 1190b092943f..8a4d72e78b81 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -31,7 +31,6 @@ using namespace psp;
 using namespace padmin;
 
 #define PRINTER_PERSISTENCE_GROUP "KnownPrinterCommands"
-#define FAX_PERSISTENCE_GROUP "KnownFaxCommands"
 #define PDF_PERSISTENCE_GROUP "KnowPdfCommands"
 #define MAX_COMMANDS 50
 
@@ -184,12 +183,6 @@ void CommandStore::getPdfCommands( ::std::list< OUString >& rCommands )
     getStoredCommands( PDF_PERSISTENCE_GROUP, rCommands );
 }
 
-void CommandStore::getFaxCommands( ::std::list< OUString >& rCommands )
-{
-    rCommands.clear();
-    getStoredCommands( FAX_PERSISTENCE_GROUP, rCommands );
-}
-
 void CommandStore::setPrintCommands( const ::std::list< OUString >& rCommands )
 {
     ::std::list< OUString > aSysCmds;
@@ -204,13 +197,6 @@ void CommandStore::setPdfCommands( const ::std::list< OUString >& rCommands )
     setCommands( PDF_PERSISTENCE_GROUP, rCommands, aSysCmds );
 }
 
-void CommandStore::setFaxCommands( const ::std::list< OUString >& rCommands )
-{
-    ::std::list< OUString > aSysCmds;
-    setCommands( FAX_PERSISTENCE_GROUP, rCommands, aSysCmds );
-}
-
-
 RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         TabPage( pParent->m_pTabControl, PaResId( RID_RTS_COMMANDPAGE ) ),
         m_pParent( pParent ),
@@ -227,10 +213,8 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         m_aPdfDirectoryText( this, PaResId( RID_RTS_CMD_TXT_PDFDIR ) ),
         m_aPdfDirectoryButton( this, PaResId( RID_RTS_CMD_BTN_PDFDIR ) ),
         m_aPdfDirectoryEdit( this, PaResId( RID_RTS_CMD_EDT_PDFDIR ) ),
-        m_aFaxSwallowBox( this, PaResId( RID_RTS_CMD_BOX_SWALLOWFAXNO ) ),
         m_aHelpButton( this, PaResId( RID_RTS_CMD_BTN_HELP ) ),
         m_aRemovePB( this, PaResId( RID_RTS_CMD_BTN_REMOVE ) ),
-        m_aFaxHelp( PaResId( RID_RTS_CMD_STR_FAXHELP ) ),
         m_aPrinterHelp( PaResId( RID_RTS_CMD_STR_PRINTERHELP ) ),
         m_aPdfHelp( PaResId( RID_RTS_CMD_STR_PDFHELP ) ),
         m_bWasExternalDialog(false)
@@ -241,13 +225,11 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         m_nPrinterEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_PRINTER ) ) );
     else
         m_nPrinterEntry = ~0;
-    m_nFaxEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_FAX ) ) );
     m_nPdfEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_PDF ) ) );
 
     FreeResource();
 
     CommandStore::getPrintCommands( m_aPrinterCommands );
-    CommandStore::getFaxCommands( m_aFaxCommands );
     CommandStore::getPdfCommands( m_aPdfCommands );
 
     m_aPrinterName.SetText( m_pParent->m_aPrinter );
@@ -264,26 +246,16 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
     m_aPdfDirectoryButton.Show( false );
     m_aPdfDirectoryEdit.Show( false );
     m_aPdfDirectoryText.Show( false );
-    m_aFaxSwallowBox.Show( false );
     m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
     m_aQuickCB.SetText( m_pParent->m_aJobData.m_aQuickCommand );
 
-    m_bWasFax = false;
     m_bWasPdf = false;
     m_aConfigureBox.SelectEntryPos( m_nPrinterEntry );
     sal_Int32 nIndex = 0;
     while( nIndex != -1 )
     {
         OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) );
-        if( aToken.startsWith( "fax" ) )
-        {
-            m_bWasFax = true;
-            m_aFaxSwallowBox.Show( true );
-            sal_Int32 nPos = 0;
-            m_aFaxSwallowBox.Check( aToken.getToken( 1, '=', nPos ).startsWith( "swallow" ) ? sal_True : sal_False );
-            m_aConfigureBox.SelectEntryPos( m_nFaxEntry );
-        }
-        else if( aToken.startsWith( "pdf=" ) )
+        if( aToken.startsWith( "pdf=" ) )
         {
             m_bWasPdf = true;
             sal_Int32 nPos = 0;
@@ -316,22 +288,18 @@ RTSCommandPage::~RTSCommandPage()
 void RTSCommandPage::save()
 {
     OUString aCommand,aQuickCommand;
-    bool bHaveFax = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? true : false;
     bool bHavePdf = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? true : false;
     ::std::list< OUString >::iterator it;
 
     OUString aFeatures;
     sal_Int32 nIndex = 0;
     OUString aOldPdfPath;
-    bool bOldFaxSwallow = false;
-    bool bFaxSwallow = m_aFaxSwallowBox.IsChecked() ? true : false;
     bool bExternalDialog = m_aExternalCB.IsChecked() ? true : false;
 
     while( nIndex != -1 )
     {
         OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) );
-        if( !aToken.startsWith( "fax" ) &&
-            !aToken.startsWith( "pdf" ) &&
+        if( !aToken.startsWith( "pdf" ) &&
             aToken.compareToAscii( "external_dialog" )
           )
         {
@@ -347,11 +315,6 @@ void RTSCommandPage::save()
             sal_Int32 nPos = 0;
             aOldPdfPath = aToken.getToken( 1, '=', nPos );
         }
-        else if( aToken.startsWith( "fax=" ) )
-        {
-            sal_Int32 nPos = 0;
-            bOldFaxSwallow = aToken.getToken( 1, '=', nPos ).startsWith( "swallow" );
-        }
     }
     ::std::list< OUString >* pList = &m_aPrinterCommands;
     if( bExternalDialog )
@@ -360,15 +323,6 @@ void RTSCommandPage::save()
             aFeatures += ",";
         aFeatures += "external_dialog" ;
     }
-    if( bHaveFax )
-    {
-        if( !aFeatures.isEmpty() )
-            aFeatures += ",";
-        aFeatures += "fax=" ;
-        if( bFaxSwallow )
-            aFeatures +=  "swallow" ;
-        pList = &m_aFaxCommands;
-    }
     if( bHavePdf )
     {
         if( !aFeatures.isEmpty() )
@@ -386,12 +340,9 @@ void RTSCommandPage::save()
 
     if( aCommand != m_pParent->m_aJobData.m_aCommand                        ||
         aQuickCommand != m_pParent->m_aJobData.m_aQuickCommand              ||
-        ( m_bWasFax && ! bHaveFax )                                         ||
-        ( ! m_bWasFax && bHaveFax )                                         ||
         ( m_bWasPdf && ! bHavePdf )                                         ||
         ( ! m_bWasPdf && bHavePdf )                                         ||
         ( bHavePdf && aOldPdfPath != m_aPdfDirectoryEdit.GetText() )        ||
-        ( bHaveFax && bFaxSwallow != bOldFaxSwallow )                       ||
         ( m_bWasExternalDialog && ! bExternalDialog )                       ||
         ( ! m_bWasExternalDialog && bExternalDialog )
         )
@@ -403,7 +354,6 @@ void RTSCommandPage::save()
         PrinterInfoManager::get().changePrinterInfo( m_pParent->m_aPrinter, m_pParent->m_aJobData );
     }
     CommandStore::setPrintCommands( m_aPrinterCommands );
-    CommandStore::setFaxCommands( m_aFaxCommands );
     CommandStore::setPdfCommands( m_aPdfCommands );
 }
 
@@ -416,8 +366,6 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox )
         m_aPdfDirectoryButton.Show( bEnable );
         m_aPdfDirectoryEdit.Show( bEnable );
         m_aPdfDirectoryText.Show( bEnable );
-        bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? sal_True : sal_False;
-        m_aFaxSwallowBox.Show( bEnable );
         UpdateCommands();
     }
     else if( pBox == &m_aCommandsCB )
@@ -442,8 +390,6 @@ IMPL_LINK( RTSCommandPage, ClickBtnHdl, Button*, pButton )
         ::std::list< OUString >* pList;
         if( m_aConfigureBox.GetSelectEntryPos() == m_nPrinterEntry )
             pList = &m_aPrinterCommands;
-        else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
-            pList = &m_aFaxCommands;
         else
             pList = &m_aPdfCommands;
 
@@ -456,8 +402,6 @@ IMPL_LINK( RTSCommandPage, ClickBtnHdl, Button*, pButton )
         OUString aHelpText;
         if( m_aConfigureBox.GetSelectEntryPos() == m_nPrinterEntry )
             aHelpText = m_aPrinterHelp;
-        else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
-            aHelpText = m_aFaxHelp;
         else if( m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry )
             aHelpText = m_aPdfHelp;
 
@@ -497,22 +441,7 @@ void RTSCommandPage::UpdateCommands()
             m_aCommandsCB.InsertEntry( *it );
             m_aQuickCB.InsertEntry( *it );
         }
-        if( ! m_bWasFax )
-            m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
-        else
-            m_aCommandsCB.SetText( OUString() );
-    }
-    else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
-    {
-        for( it = m_aFaxCommands.begin(); it != m_aFaxCommands.end(); ++it )
-        {
-            m_aCommandsCB.InsertEntry( *it );
-            m_aQuickCB.InsertEntry( *it );
-        }
-        if( m_bWasFax )
-            m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
-        else
-            m_aCommandsCB.SetText( OUString() );
+        m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
     }
     else if( m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry )
     {
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 5db1b46c713d..1fdb0aa7c984 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -44,11 +44,9 @@ class CommandStore
 
 public:
     static void getPrintCommands( ::std::list< OUString >& rCommands );
-    static void getFaxCommands( ::std::list< OUString >& rCommands );
     static void getPdfCommands( ::std::list< OUString >& rCommands );
 
     static void setPrintCommands( const ::std::list< OUString >& rCommands );
-    static void setFaxCommands( const ::std::list< OUString >& rCommands );
     static void setPdfCommands( const ::std::list< OUString >& rCommands );
 };
 
@@ -69,25 +67,20 @@ private:
     FixedText                       m_aConfigureText;
     ListBox                         m_aConfigureBox;
     sal_uInt16                          m_nPrinterEntry;
-    sal_uInt16                          m_nFaxEntry;
     sal_uInt16                          m_nPdfEntry;
     FixedText                       m_aPdfDirectoryText;
     PushButton                      m_aPdfDirectoryButton;
     Edit                            m_aPdfDirectoryEdit;
-    CheckBox                        m_aFaxSwallowBox;
 
     PushButton                      m_aHelpButton;
     PushButton                      m_aRemovePB;
 
     ::std::list< OUString >         m_aPrinterCommands;
-    ::std::list< OUString >         m_aFaxCommands;
     ::std::list< OUString >         m_aPdfCommands;
 
-    OUString                        m_aFaxHelp;
     OUString                        m_aPrinterHelp;
     OUString                        m_aPdfHelp;
 
-    bool                            m_bWasFax;
     bool                            m_bWasPdf;
     bool                            m_bWasExternalDialog;
 
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 286adda6e18b..9e8eff3c3c35 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -101,7 +101,6 @@ PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) :
 void PADialog::updateSettings()
 {
     m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
-    m_aFaxImg     = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX     ) ) );
     m_aPdfImg     = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF     ) ) );
 }
 
@@ -688,7 +687,6 @@ void PADialog::UpdateDevice()
         const PrinterInfo& rInfo( m_rPIManager.getPrinterInfo( *it ) );
         sal_Int32 nIndex = 0;
         bool bAutoQueue = false;
-        bool bFax = false;
         bool bPdf = false;
         while( nIndex != -1 && ! bAutoQueue )
         {
@@ -699,8 +697,6 @@ void PADialog::UpdateDevice()
                     bAutoQueue = true;
                 else if( aToken.startsWith("pdf=") )
                     bPdf = true;
-                else if( aToken.startsWith("fax") )
-                    bFax = true;
             }
         }
         if( bAutoQueue )
@@ -713,9 +709,7 @@ void PADialog::UpdateDevice()
         }
         int nPos =
             m_aDevicesLB.InsertEntry( aEntry,
-                                      bFax ? m_aFaxImg :
-                                      bPdf ? m_aPdfImg : m_aPrinterImg
-                                      );
+                                      bPdf ? m_aPdfImg : m_aPrinterImg );
         m_aDevicesLB.SetEntryData( nPos, (void*)(sal_IntPtr)it->getLength() );
         if( *it == m_rPIManager.getDefaultPrinter() )
         {
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index f438d0586d09..b9b095ee9f9c 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -87,7 +87,6 @@
 #define RID_TXT_TESTPAGE_NAME                    1077
 
 #define RID_BMP_SMALL_PRINTER                    1096
-#define RID_BMP_SMALL_FAX                        1098
 #define RID_BMP_SMALL_PDF                        1100
 #define RID_BMP_PRINTER                          1102
 
@@ -110,8 +109,7 @@
 #define RID_ADDP_PAGE_CHOOSEDEV                 2001
 #define RID_ADDP_CHDEV_TXT_OVER                 1
 #define RID_ADDP_CHDEV_BTN_PRINTER              2
-#define RID_ADDP_CHDEV_BTN_FAX                  3
-#define RID_ADDP_CHDEV_BTN_PDF                  4
+#define RID_ADDP_CHDEV_BTN_PDF                  3
 
 #define RID_ADDP_PAGE_CHOOSEDRIVER              2002
 #define RID_ADDP_CHDRV_TXT_DRIVER               1
@@ -122,30 +120,21 @@
 
 #define RID_ADDP_PAGE_NAME                      2003
 #define RID_ADDP_NAME_TXT_NAME                  1
-#define RID_ADDP_NAME_TXT_FAXNAME               2
 #define RID_ADDP_NAME_TXT_PDFNAME               3
 #define RID_ADDP_NAME_EDT_NAME                  4
-#define RID_ADDP_NAME_EDT_FAXNAME               5
 #define RID_ADDP_NAME_EDT_PDFNAME               6
 #define RID_ADDP_NAME_BOX_DEFAULT               7
-#define RID_ADDP_NAME_BOX_FAXSWALLOW            8
 
 #define RID_ADDP_PAGE_COMMAND                   2004
 #define RID_ADDP_CMD_TXT_COMMAND                1
 #define RID_ADDP_CMD_BOX_COMMAND                2
 #define RID_ADDP_CMD_BTN_HELP                   3
-#define RID_ADDP_CMD_STR_FAXHELP                4
 #define RID_ADDP_CMD_STR_PDFHELP                5
 #define RID_ADDP_CMD_TXT_PDFDIR                 6
 #define RID_ADDP_CMD_EDT_PDFDIR                 7
 #define RID_ADDP_CMD_BTN_PDFDIR                 8
 #define RID_ADDP_CMD_BOX_PDFCOMMAND             9
 
-#define RID_ADDP_PAGE_FAXDRIVER                 2006
-#define RID_ADDP_FAXDRV_TXT_DRIVER              1
-#define RID_ADDP_FAXDRV_BTN_DEFAULT             2
-#define RID_ADDP_FAXDRV_BTN_SELECT              3
-
 #define RID_ADDP_PAGE_PDFDRIVER                 2007
 #define RID_ADDP_PDFDRV_TXT_DRIVER              1
 #define RID_ADDP_PDFDRV_BTN_DEFAULT             2
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 6dd6834f1ce4..e7620c2fd07d 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -67,7 +67,6 @@ namespace padmin {
         ::std::list< OUString >      m_aPrinters;
 
         Image                               m_aPrinterImg;
-        Image                               m_aFaxImg;
         Image                               m_aPdfImg;
 
         DECL_LINK( ClickBtnHdl, PushButton* );
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 3bfffa719e72..ad16e52c20ee 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -244,11 +244,6 @@ Bitmap RID_BMP_SMALL_PRINTER
     File = "source/print.png";
 };
 
-Bitmap RID_BMP_SMALL_FAX
-{
-    File = "source/fax.png";
-};
-
 Bitmap RID_BMP_SMALL_PDF
 {
     File = "source/pdf.png";
@@ -516,7 +511,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
     HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
-    Size = MAP_APPFONT( 240, 120 );
+    Size = MAP_APPFONT( 240, 110 );
     String RID_ADDP_STR_TITLE
     {
         Text [ en-US ] = "Choose a device type";
@@ -534,17 +529,10 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Add a ~printer";
     };
-    RadioButton RID_ADDP_CHDEV_BTN_FAX
-    {
-        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX";
-        Pos = MAP_APPFONT ( 40, 50 );
-        Size = MAP_APPFONT( 180, 10 );
-        Text [ en-US ] = "Connect a fa~x device";
-    };
     RadioButton RID_ADDP_CHDEV_BTN_PDF
     {
         HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF";
-        Pos = MAP_APPFONT ( 40, 60 );
+        Pos = MAP_APPFONT ( 40, 50 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
     };
@@ -566,12 +554,6 @@ TabPage RID_ADDP_PAGE_NAME
         Size = MAP_APPFONT( 220, 8 );
         Text [ en-US ] = "Please enter a name for the printer.";
     };
-    FixedText RID_ADDP_NAME_TXT_FAXNAME
-    {
-        Pos = MAP_APPFONT( 40, 25 );
-        Size = MAP_APPFONT( 220, 8 );
-        Text [ en-US ] = "Please enter a name for the fax connection.";
-    };
     FixedText RID_ADDP_NAME_TXT_PDFNAME
     {
         Pos = MAP_APPFONT( 40, 25 );
@@ -585,14 +567,6 @@ TabPage RID_ADDP_PAGE_NAME
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
     };
-    Edit RID_ADDP_NAME_EDT_FAXNAME
-    {
-        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME";
-        Pos = MAP_APPFONT( 40, 35 );
-        Size = MAP_APPFONT( 160, 12 );
-        Border = TRUE;
-        Text [ en-US ] = "Fax printer";
-    };
     Edit RID_ADDP_NAME_EDT_PDFNAME
     {
         HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME";
@@ -608,13 +582,6 @@ TabPage RID_ADDP_PAGE_NAME
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "~Use as default printer";
     };
-    CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW
-    {
-        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW";
-        Pos = MAP_APPFONT( 40, 50 );
-        Size = MAP_APPFONT( 160, 12 );
-        Text [ en-US ] = "Remo~ve fax number from output";
-    };
 };
 
 TabPage RID_ADDP_PAGE_COMMAND
@@ -679,43 +646,6 @@ TabPage RID_ADDP_PAGE_COMMAND
     {
         Text [ en-US ] = "The command line for PDF converters is executed as follows: for each document printed, \"(TMP)\" in the command line is replaced by a temporary file and \"(OUTFILE)\" in the command line is replaced by the target PDF file name. If \"(TMP)\" is in the command line, the PostScript code will be supplied via a file, otherwise via standard input (i.e. as a pipe).";
     };
-    String RID_ADDP_CMD_STR_FAXHELP
-    {
-        Text [ en-US ] = "The command line for fax connections is executed as follows: for each fax sent, \"(TMP)\" in the command line is replaced by a temporary file and \"(PHONE)\" in the command line is replaced by the fax number. If \"(TMP)\" appears in the command line, the PostScript code will be supplied via a file, otherwise it is passed as standard input (i.e. as a pipe).";
-    };
-};
-
-TabPage RID_ADDP_PAGE_FAXDRIVER
-{
-    HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER";
-    Hide = TRUE;
-    Pos = MAP_APPFONT( 0, 30 );
-    Size = MAP_APPFONT( 240, 120 );
-    String RID_ADDP_STR_TITLE
-    {
-        Text [ en-US ] = "Choose a driver";
-    };
-    FixedText RID_ADDP_FAXDRV_TXT_DRIVER
-    {
-        Pos = MAP_APPFONT( 40, 20 );
-        Size = MAP_APPFONT( 160, 19 );
-        WordBreak = TRUE;
-        Text [ en-US ] = "Use the following driver for this fax connection";
-    };
-    RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT
-    {
-        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT";
-        Pos = MAP_APPFONT( 40,40 );
-        Size = MAP_APPFONT( 160, 10 );
-        Text [ en-US ] = "T~he default driver";
-    };
-    RadioButton RID_ADDP_FAXDRV_BTN_SELECT
-    {
-        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT";
-        Pos = MAP_APPFONT( 40, 50 );
-        Size = MAP_APPFONT( 160,24 );
-        Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer";
-    };
 };
 
 TabPage RID_ADDP_PAGE_PDFDRIVER
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 42ba728a4e10..11bf33414460 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -45,16 +45,13 @@
 #define RID_RTS_CMD_TXT_CONFIGURE           7
 #define RID_RTS_CMD_LB_CONFIGURE            8
 #define RID_RTS_CMD_STR_CONFIGURE_PRINTER   9
-#define RID_RTS_CMD_STR_CONFIGURE_FAX       10
 #define RID_RTS_CMD_STR_CONFIGURE_PDF       11
 #define RID_RTS_CMD_STR_PRINTERHELP     12
-#define RID_RTS_CMD_STR_FAXHELP         13
 #define RID_RTS_CMD_STR_PDFHELP         14
 #define RID_RTS_CMD_BTN_REMOVE              15
 #define RID_RTS_CMD_EDT_PDFDIR              16
 #define RID_RTS_CMD_BTN_PDFDIR              17
 #define RID_RTS_CMD_TXT_PDFDIR              18
-#define RID_RTS_CMD_BOX_SWALLOWFAXNO        19
 #define RID_RTS_CMD_CB_EXTERNAL             20
 #define RID_RTS_CMD_FT_QUICKCMD             21
 #define RIT_RTS_CMD_CB_QUICKCMD             22
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index ad8de70bd9d7..f95a009220d7 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -72,10 +72,6 @@ TabPage RID_RTS_COMMANDPAGE
     {
         Text [ en-US ] = "Printer";
     };
-    String RID_RTS_CMD_STR_CONFIGURE_FAX
-    {
-        Text [ en-US ] = "Fax";
-    };
     String RID_RTS_CMD_STR_CONFIGURE_PDF
     {
         Text [ en-US ] = "PDF converter";
@@ -96,13 +92,6 @@ TabPage RID_RTS_COMMANDPAGE
         Text [ en-US ] = "~Configure as";
     };
 
-    CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO
-    {
-        HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO";
-        Pos = MAP_APPFONT( 11, 146 );
-        Size = MAP_APPFONT( 130, 8 );
-        Text [ en-US ] = "~Fax number will be removed from output";
-    };
     FixedText RID_RTS_CMD_TXT_PDFDIR
     {
         Pos = MAP_APPFONT( 11, 146 );
@@ -162,10 +151,6 @@ TabPage RID_RTS_COMMANDPAGE
     {
         Text [ en-US ] = "The command line for printer devices is executed as follows: the generated PostScript code is supplied as standard input (i.e. as a pipe) to the command line.";
     };
-    String RID_RTS_CMD_STR_FAXHELP
-    {
-        Text [ en-US ] = "The command line for fax devices is executed as follows: for each fax sent, \"(TMP)\" in the command line is replaced by a temporary file and \"(PHONE)\" in the command line is replaced by the fax number. If \"(TMP)\" appears in the command line, the PostScript code will be supplied via a file, otherwise it is passed as standard input (i.e. as a pipe).";
-    };
 };
 
 TabPage RID_RTS_OTHERPAGE