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
This commit is contained in:
parent
c4be97e614
commit
f281af451c
1 changed files with 6 additions and 6 deletions
|
@ -4,9 +4,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: filepickerstate.cxx,v $
|
* $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 Contents of this file are made available subject to
|
||||||
* the terms of GNU Lesser General Public License Version 2.1.
|
* 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)
|
while (pTemp < pStrEnd)
|
||||||
{
|
{
|
||||||
// detect the length of the next sub string
|
// detect the length of the next sub string
|
||||||
lSubStr = wcslen(pTemp);
|
lSubStr = rtl_ustr_getLength(pTemp);
|
||||||
|
|
||||||
aFilePathList.realloc(aFilePathList.getLength() + 1);
|
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
|
// somewhat risky because we don't know if OUString
|
||||||
// has a terminating '\0'
|
// 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 );
|
hwndCtrl = GetListboxLabelItem( aControlId );
|
||||||
|
|
||||||
sal_Unicode aLabel[MAX_LABEL];
|
sal_Unicode aLabel[MAX_LABEL];
|
||||||
int nRet = GetWindowText( hwndCtrl, aLabel, MAX_LABEL );
|
int nRet = GetWindowText( hwndCtrl, reinterpret_cast<LPTSTR>(aLabel), MAX_LABEL );
|
||||||
|
|
||||||
OUString ctrlLabel;
|
OUString ctrlLabel;
|
||||||
if ( nRet )
|
if ( nRet )
|
||||||
{
|
{
|
||||||
ctrlLabel = OUString( aLabel, wcslen( aLabel ) );
|
ctrlLabel = OUString( aLabel, rtl_ustr_getLength( aLabel ) );
|
||||||
ctrlLabel = WindowsToSOfficeLabel( aLabel );
|
ctrlLabel = WindowsToSOfficeLabel( aLabel );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue