on generic X11 unix we always use fontconfig

4 files changed, 2 insertions, 26 deletions

diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index ee3a815fa042..9b0e62e4812f 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -99,7 +99,6 @@ PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) :
         m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
         m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
         m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
-        m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
         m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
         m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
         m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
@@ -135,20 +134,10 @@ void PADialog::Init()
     m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
     m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
     m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
-    m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
     m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
     m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
     m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
 
-    ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
-    if( ! rFontManager.checkImportPossible() )
-        m_aFontsPB.Enable( sal_False );
-    if( rFontManager.hasFontconfig() )
-    {
-        m_aFontsPB.Enable( sal_False );
-        m_aFontsPB.Show( sal_False );
-    }
-
     // at this point no actual changes will be  written
     // but the write will have checked whether any writeable config exists
     if( ! m_rPIManager.writePrinterConfig() )
@@ -227,11 +216,6 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushButton*, pButton )
         PrintTestPage();
     else if( pButton == &m_aAddPB )
         AddDevice();
-    else if( pButton == &m_aFontsPB )
-    {
-        FontNameDlg aDialog( this );
-        aDialog.Execute();
-    }
     else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
     {
         m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 69e12428ddab..9ae1bfeeee26 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -33,11 +33,11 @@
 #define RID_PA_BTN_STD                      2
 #define RID_PA_BTN_DEL                      3
 #define RID_PA_LB_DEV                       4
-#define RID_PA_FL_PRINTERS                   5
+#define RID_PA_FL_PRINTERS                  5
 #define RID_PA_BTN_CONF                     6
 #define RID_PA_BTN_RENAME                   7
 #define RID_PA_TESTPAGE                     8
-#define RID_PA_BTN_FONTS                    9
+
 #define RID_PA_TXT_DRIVER                   10
 #define RID_PA_TXT_DRIVER_STRING            11
 #define RID_PA_TXT_LOCATION                 12
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 4f39f03b6727..9c6646fb21d8 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -68,7 +68,6 @@ namespace padmin {
 
         FixedLine                           m_aSepButtonFL;
         PushButton                          m_aAddPB;
-        PushButton                          m_aFontsPB;
         CancelButton                        m_aCancelButton;
 
         String                              m_aDefPrt;
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index f9f9b165af7b..194dea7e9b3f 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -281,13 +281,6 @@ ModalDialog RID_PADIALOG
         Text [ en-US ] = "Test ~Page";
     };
 
-    PushButton RID_PA_BTN_FONTS
-    {
-        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS";
-        Pos = MAP_APPFONT( 80, 181 );
-        Size = MAP_APPFONT( 70, 12 );
-        Text [ en-US ] = "Fon~ts...";
-    };
     PushButton RID_PA_BTN_ADD
     {
         HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD";