diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:19:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:19:21 +0000 |
| commit | f281af451c6f4eda9eca9ff32cee1b2654c3fd1a (patch) | |
| tree | 80f3eaf3bf7f7a62004be37d32b54d9e7cf00bef /fpicker | |
| parent | c4be97e6144a9e5b0e8ba33b2f7c9e82d3299d64 (diff) | |
INTEGRATION: CWS mingwport03 (1.9.106); FILE MERGED
2006/11/07 18:02:19 vg 1.9.106.2: RESYNC: (1.9-1.11); FILE MERGED
2006/09/07 09:07:19 vg 1.9.106.1: #i53572# MinGW port
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/filepickerstate.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index fd21a213d658..6f1e9640ed1e 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -4,9 +4,9 @@ * * $RCSfile: filepickerstate.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2006-10-12 10:52:54 $ + * last change: $Author: vg $ $Date: 2007-03-26 13:19:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -289,7 +289,7 @@ Sequence< OUString > SAL_CALL CNonExecuteFilePickerState::getFiles( CFileOpenDia while (pTemp < pStrEnd) { // detect the length of the next sub string - lSubStr = wcslen(pTemp); + lSubStr = rtl_ustr_getLength(pTemp); aFilePathList.realloc(aFilePathList.getLength() + 1); @@ -518,7 +518,7 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS // somewhat risky because we don't know if OUString // has a terminating '\0' - SetWindowText( hwndCtrl, aWinLabel.getStr( ) ); + SetWindowText( hwndCtrl, reinterpret_cast<LPCTSTR>(aWinLabel.getStr( )) ); } //--------------------------------------------- @@ -535,12 +535,12 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) hwndCtrl = GetListboxLabelItem( aControlId ); sal_Unicode aLabel[MAX_LABEL]; - int nRet = GetWindowText( hwndCtrl, aLabel, MAX_LABEL ); + int nRet = GetWindowText( hwndCtrl, reinterpret_cast<LPTSTR>(aLabel), MAX_LABEL ); OUString ctrlLabel; if ( nRet ) { - ctrlLabel = OUString( aLabel, wcslen( aLabel ) ); + ctrlLabel = OUString( aLabel, rtl_ustr_getLength( aLabel ) ); ctrlLabel = WindowsToSOfficeLabel( aLabel ); } |