summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions/sellang/sellang.cxx
diff options
context:
space:
mode:
authorskswales <stuart.swales.croftnuisk@gmail.com>2016-05-19 15:18:36 +0100
committerMichael Stahl <mstahl@redhat.com>2016-05-24 20:41:57 +0000
commit68502698d29e577a7a451f1a796677128901cfe3 (patch)
tree8aba6e54b5174e8cf9da006e502ea8b7d61d20db /setup_native/source/win32/customactions/sellang/sellang.cxx
parent074bd09ee6f3113792b60ee721aabb731c5d7ace (diff)
Work towards tdf#72606 EasyHack _tstring/TCHAR elimination
win32/customactions/sellang use A/W suffixed functions as appropriate Change-Id: Ic609a6dfb8033585cd2043a77985578abfdae893 Reviewed-on: https://gerrit.libreoffice.org/25167 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'setup_native/source/win32/customactions/sellang/sellang.cxx')
-rw-r--r--setup_native/source/win32/customactions/sellang/sellang.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e72fe0969a3a..4f2827da801a 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -37,15 +37,15 @@
#include "spellchecker_selection.hxx"
-BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
+BOOL GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{
DWORD sz = 0;
- if ( MsiGetProperty( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) {
+ if ( MsiGetPropertyA( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) {
sz++;
DWORD nbytes = sz * sizeof( char );
char* buff = reinterpret_cast<char*>( malloc( nbytes ) );
ZeroMemory( buff, nbytes );
- MsiGetProperty( hMSI, pPropName, buff, &sz );
+ MsiGetPropertyA( hMSI, pPropName, buff, &sz );
*ppValue = buff;
return ( strlen(buff) > 0 );
}
@@ -309,7 +309,7 @@ extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
* requested with the UI_LANGS property, or all available on the system:
*/
char* pVal = NULL;
- if ( (GetMsiProp( handle, "UI_LANGS", &pVal )) && pVal ) {
+ if ( (GetMsiPropA( handle, "UI_LANGS", &pVal )) && pVal ) {
char *str_ptr;
str_ptr = strtok(pVal, ",");
for(; str_ptr != NULL ;) {