openoffice-padmin-nofontconfig.patch

   1 diff -urN padmin-old/source/makefile.mk padmin/source/makefile.mk
   2 --- padmin-old/source/makefile.mk       2003-10-13 02:02:59.000000000 +0200
   3 +++ padmin/source/makefile.mk   2003-10-13 02:25:38.000000000 +0200
   4 @@ -70,6 +70,10 @@
   5
   6  .INCLUDE: settings.mk
   7
   8 +.IF "$(FONTCONFIG_FONTS)" != ""
   9 +CFLAGS+=-DFONTCONFIG_FONTS
  10 +.ENDIF
  11 +
  12  # --- Files --------------------------------------------------------
  13
  14  SRCFILES=padialog.src rtsetup.src
  15 @@ -95,11 +99,13 @@
  16         $(SLO)$/newppdlg.obj            \
  17         $(SLO)$/prtsetup.obj            \
  18         $(SLO)$/prgsbar.obj                     \
  19 -       $(SLO)$/fontentry.obj           \
  20         $(SLO)$/helper.obj                      \
  21         $(SLO)$/adddlg.obj                      \
  22         $(SLO)$/titlectrl.obj
  23
  24 +.IF "$(FONTCONFIG_FONTS)" == ""
  25 +SLOFILES+= $(SLO)$/fontentry.obj
  26 +.ENDIF
  27
  28  OBJFILES=\
  29         $(OBJ)/pamain.obj
  30 diff -urN padmin-old/source/padialog.cxx padmin/source/padialog.cxx
  31 --- padmin-old/source/padialog.cxx      2003-10-13 02:02:59.000000000 +0200
  32 +++ padmin/source/padialog.cxx  2003-10-13 02:08:07.000000000 +0200
  33 @@ -89,12 +89,19 @@
  34  #ifndef _TOOLS_COLOR_HXX
  35  #include <tools/color.hxx>
  36  #endif
  37 +#ifndef _URLOBJ_HXX
  38 +#include <tools/urlobj.hxx>
  39 +#endif
  40  #ifndef _PAD_PADIALOG_HRC_
  41  #include <padialog.hrc>
  42  #endif
  43 +
  44 +#ifndef FONTCONFIG_FONTS
  45  #ifndef _PAD_FONTENTRY_HXX_
  46  #include <fontentry.hxx>
  47  #endif
  48 +#endif
  49 +
  50  #ifndef _PAD_HELPER_HXX_
  51  #include <helper.hxx>
  52  #endif
  53 @@ -135,7 +142,9 @@
  54                 m_aStdPB( this, PaResId( RID_PA_BTN_STD ) ),
  55                 m_aRemPB( this, PaResId( RID_PA_BTN_DEL ) ),
  56                 m_aPrintersFL( this, PaResId( RID_PA_FL_PRINTERS ) ),
  57 +#ifndef FONTCONFIG_FONTS
  58                 m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
  59 +#endif
  60                 m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ),
  61                 m_aRenamePB( this, PaResId( RID_PA_BTN_RENAME ) ),
  62                 m_aTestPagePB( this, PaResId( RID_PA_TESTPAGE ) ),
  63 @@ -174,13 +183,15 @@
  64         m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  65         m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  66         m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  67 -       m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  68         m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  69         m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
  70
  71 +#ifndef FONTCONFIG_FONTS
  72 +       m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  73         ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
  74         if( ! rFontManager.checkImportPossible() )
  75                 m_aFontsPB.Enable( FALSE );
  76 +#endif
  77  }
  78
  79  PADialog::~PADialog()
  80 @@ -217,11 +228,13 @@
  81                 PrintTestPage();
  82         else if( pButton == &m_aAddPB )
  83                 AddDevice();
  84 +#ifndef FONTCONFIG_FONTS
  85         else if( pButton == &m_aFontsPB )
  86         {
  87                 FontNameDlg aDialog( this );
  88                 aDialog.Execute();
  89         }
  90 +#endif
  91
  92         return 0;
  93  }
  94 diff -urN padmin-old/source/padialog.hxx padmin/source/padialog.hxx
  95 --- padmin-old/source/padialog.hxx      2003-10-13 02:02:59.000000000 +0200
  96 +++ padmin/source/padialog.hxx  2003-10-13 02:08:07.000000000 +0200
  97 @@ -118,7 +118,9 @@
  98
  99          FixedLine                                                      m_aSepButtonFL;
 100                 PushButton                                                      m_aAddPB;
 101 +#ifndef FONTCONFIG_FONTS
 102                 PushButton                                                      m_aFontsPB;
 103 +#endif
 104                 CancelButton                                            m_aCancelButton;
 105
 106                 String                                                          m_aDefPrt;