applied_patches/0286-fpicker-kde-resmgr.diff

   1 --- fpicker/source/unx/kde_unx/UnxFilePicker.cxx        2005-05-23 16:40:20.093844000 +0200
   2 +++ fpicker/source/unx/kde_unx/UnxFilePicker.cxx        2005-05-26 10:49:11.305359078 +0200
   3 @@ -107,8 +107,8 @@
   4  #include <FPServiceInfo.hxx>
   5  #endif
   6
   7 -#ifndef _SVTOOLS_SVTDATA_HXX
   8 -#include <svtools/svtdata.hxx>
   9 +#ifndef _TOOLS_RESMGR_HXX
  10 +#include <tools/resmgr.hxx>
  11  #endif
  12
  13  #ifndef _SVTOOLS_HRC
  14 @@ -178,7 +178,8 @@ UnxFilePicker::UnxFilePicker( const uno:
  15            m_nFilePickerWrite( -1 ),
  16            m_nFilePickerRead( -1 ),
  17            m_pNotifyThread( NULL ),
  18 -          m_pCommandThread( NULL )
  19 +          m_pCommandThread( NULL ),
  20 +          m_pResMgr( CREATEVERSIONRESMGR( fps_office ) )
  21  {
  22  }
  23
  24 @@ -211,6 +212,8 @@ UnxFilePicker::~UnxFilePicker()
  25
  26      if ( m_nFilePickerRead >= 0 )
  27          close( m_nFilePickerRead );
  28 +
  29 +    delete m_pResMgr, m_pResMgr = NULL;
  30  }
  31
  32  void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
  33 @@ -970,7 +973,7 @@ void UnxFilePicker::sendAppendControlCom
  34          aBuffer.appendAscii( " ", 1 );
  35          appendEscaped( aBuffer, aType );
  36          aBuffer.appendAscii( " ", 1 );
  37 -        appendEscaped( aBuffer, String( SvtResId( nTitleId ) ) );
  38 +        appendEscaped( aBuffer, m_pResMgr? String( ResId( nTitleId, *m_pResMgr ) ): String() );
  39
  40          sendCommand( aBuffer.makeStringAndClear() );
  41      }
  42 --- fpicker/source/unx/kde_unx/UnxFilePicker.hxx        2005-05-23 16:40:20.094844000 +0200
  43 +++ fpicker/source/unx/kde_unx/UnxFilePicker.hxx        2005-05-26 10:40:18.652234700 +0200
  44 @@ -114,6 +114,7 @@
  45
  46  class UnxFilePickerCommandThread;
  47  class UnxFilePickerNotifyThread;
  48 +class ResMgr;
  49
  50  class UnxFilePickerDummy
  51  {
  52 @@ -145,6 +146,8 @@ protected:
  53      UnxFilePickerNotifyThread  *m_pNotifyThread;
  54      UnxFilePickerCommandThread *m_pCommandThread;
  55
  56 +    ResMgr                     *m_pResMgr;
  57 +
  58  public:
  59      UnxFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
  60      virtual ~UnxFilePicker();
  61 --- fpicker/source/unx/kde_unx/makefile.mk      2004-06-15 10:52:55.099580592 +0200
  62 +++ fpicker/source/unx/kde_unx/makefile.mk      2004-06-15 10:52:55.099580592 +0200
  63 @@ -95,8 +95,7 @@ DEF1EXPORTFILE=       exports.dxp
  64                 $(CPPUHELPERLIB)\
  65                 $(SALLIB)\
  66                 $(VCLLIB)\
  67 -               $(TOOLSLIB)\
  68 -               $(SVTOOLLIB)
  69 +               $(TOOLSLIB)
  70
  71  SHL1OBJS=$(SLOFILES)
  72  SHL1DEF=$(MISC)$/$(SHL1TARGET).def