strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native122 (1.8.18); FILE MERGED

Browse source 
2007/12/11 10:40:25 is 1.8.18.1: #i84368# Patch for explicit type conversion
This commit is contained in:
Kurt Zenker 2007-12-12 13:56:02 +00:00
parent 8801dcc440
commit 831e003437
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
View file

@ -151,7 +151,7 @@ bool Registrar::QueryPreselectForMsApplication(const std::wstring& file_extensio
if (!root_key->HasSubKey(file_extension))
{
preselect = true;
OutputDebugStringFormat( TEXT("QueryPreselect: No SubKey found for (%s), preselected!\n"), file_extension );
OutputDebugStringFormat( TEXT("QueryPreselect: No SubKey found for (%s), preselected!\n"), file_extension.c_str() );
}
else
{
@ -165,18 +165,18 @@ bool Registrar::QueryPreselectForMsApplication(const std::wstring& file_extensio
IsOpenOfficeRegisteredForMsApplication(RegVal->GetDataAsUniString()))
{
preselect = true;
OutputDebugStringFormat( TEXT("QueryPreselect: (%s) registered to Office, preselected!\n"), file_extension );
OutputDebugStringFormat( TEXT("QueryPreselect: (%s) registered to Office, preselected!\n"), file_extension.c_str() );
}
else if ( (REG_SZ == RegVal->GetType()) && ! root_key->HasSubKey( RegVal->GetDataAsUniString() ) )
{
preselect = true;
OutputDebugStringFormat( TEXT("QueryPreselect: (%s) registered but destination is empty, preselected!\n"), file_extension );
OutputDebugStringFormat( TEXT("QueryPreselect: (%s) registered but destination is empty, preselected!\n"), file_extension.c_str() );
}
}
else
{
preselect = true;
OutputDebugStringFormat( TEXT("QueryPreselect: No default found for SubKey (%s), preselected!\n"), file_extension );
OutputDebugStringFormat( TEXT("QueryPreselect: No default found for SubKey (%s), preselected!\n"), file_extension.c_str() );
}
}
return preselect;