diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:57:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:57:26 +0000 |
| commit | 2bff6ada7e1ef456e8b6eb3da79768cd39ab4235 (patch) | |
| tree | f251892f6221487f4cfc83bdfe05a50cb3d373c1 /fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | |
| parent | 6e8c2f132cdda2ba6fec412557a79b25c908297b (diff) | |
INTEGRATION: CWS vcl79 (1.26.24); FILE MERGED
2007/06/19 07:57:01 pl 1.26.24.1: #i77748# do not lock the solarmutex during message dispatch, this can deadlock the process
Diffstat (limited to 'fpicker/source/win32/filepicker/WinFileOpenImpl.cxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index b1655b0d8b2a..5b48594315cc 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: WinFileOpenImpl.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:19:00 $ + * last change: $Author: rt $ $Date: 2007-07-03 13:57:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,10 +92,6 @@ #include <rtl/ustrbuf.hxx> #endif -#ifndef _RESOURCEPROVIDER_HXX_ -#include "..\misc\resourceprovider.hxx" -#endif - #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> #endif @@ -623,14 +619,12 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc( void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd) { - CResourceProvider aResProvider; - //----------------------------------------- // set the labels for all extendet controls //----------------------------------------- sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd)); - rtl::OUString aLabel = aResProvider.getResString(aCtrlId); + rtl::OUString aLabel = m_ResProvider.getResString(aCtrlId); if (aLabel.getLength()) setLabel(aCtrlId, aLabel); } |