diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-08-25 17:50:04 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-08-26 12:54:53 +0200 |
| commit | f9d9066fcd7cc8dc78d5c99ddff07cceb5f61ce5 (patch) | |
| tree | 7e9518c7ea916e6580ea9164b072d98fa62df678 /fpicker | |
| parent | b0e466a0b85453a1e4cb1a64ab7f8a676ee6b790 (diff) | |
fpicker-kde-resmgr.diff: Adapt to changes in resources handling.
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/unx/kde_unx/UnxFilePicker.cxx | 10 | ||||
| -rw-r--r-- | fpicker/source/unx/kde_unx/UnxFilePicker.hxx | 3 | ||||
| -rw-r--r-- | fpicker/source/unx/kde_unx/makefile.mk | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx index 1ee8942829..a712e779e6 100644 --- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx +++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx @@ -39,7 +39,8 @@ #include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/svtdata.hxx> +#include <tools/resmgr.hxx> + #include <svtools/svtools.hrc> #include <UnxFilePicker.hxx> #include <UnxCommandThread.hxx> @@ -96,7 +97,8 @@ UnxFilePicker::UnxFilePicker( const uno::Reference<lang::XMultiServiceFactory>& m_nFilePickerWrite( -1 ), m_nFilePickerRead( -1 ), m_pNotifyThread( NULL ), - m_pCommandThread( NULL ) + m_pCommandThread( NULL ), + m_pResMgr( CREATEVERSIONRESMGR( fps_office ) ) { } @@ -129,6 +131,8 @@ UnxFilePicker::~UnxFilePicker() if ( m_nFilePickerRead >= 0 ) close( m_nFilePickerRead ); + + delete m_pResMgr, m_pResMgr = NULL; } void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) @@ -888,7 +892,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) aBuffer.appendAscii( " ", 1 ); appendEscaped( aBuffer, aType ); aBuffer.appendAscii( " ", 1 ); - appendEscaped( aBuffer, String( SvtResId( nTitleId ) ) ); + appendEscaped( aBuffer, m_pResMgr? String( ResId( nTitleId, *m_pResMgr ) ): String() ); sendCommand( aBuffer.makeStringAndClear() ); } diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.hxx b/fpicker/source/unx/kde_unx/UnxFilePicker.hxx index 9e6b07e8a2..107db3164f 100644 --- a/fpicker/source/unx/kde_unx/UnxFilePicker.hxx +++ b/fpicker/source/unx/kde_unx/UnxFilePicker.hxx @@ -47,6 +47,7 @@ class UnxFilePickerCommandThread; class UnxFilePickerNotifyThread; +class ResMgr; class UnxFilePickerDummy { @@ -78,6 +79,8 @@ protected: UnxFilePickerNotifyThread *m_pNotifyThread; UnxFilePickerCommandThread *m_pCommandThread; + ResMgr *m_pResMgr; + public: UnxFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr ); virtual ~UnxFilePicker(); diff --git a/fpicker/source/unx/kde_unx/makefile.mk b/fpicker/source/unx/kde_unx/makefile.mk index 8101aa1aa2..067399bf08 100644 --- a/fpicker/source/unx/kde_unx/makefile.mk +++ b/fpicker/source/unx/kde_unx/makefile.mk @@ -62,8 +62,7 @@ SHL1STDLIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB)\ $(VCLLIB)\ - $(TOOLSLIB)\ - $(SVTOOLLIB) + $(TOOLSLIB) SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def |