From 7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Dec 2019 13:15:21 +0200 Subject: sal_Char->char in oox..registry Change-Id: Icc7f2a32696c30317c1ee77ef39d682d5f5a80b9 Reviewed-on: https://gerrit.libreoffice.org/85512 Tested-by: Jenkins Reviewed-by: Noel Grandin --- registry/test/testmerge.cxx | 16 ++++++++-------- registry/test/testregcpp.cxx | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'registry/test') diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index cd480534abc5..2e8cbbcc59cc 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -37,7 +37,7 @@ sal_Int32 lValue1 = 123456789; sal_Int32 lValue2 = 54321; sal_Int32 lValue3 = 111333111; sal_Int32 lValue4 = 333111333; -sal_Char* sValue = (sal_Char*)"string Value"; +char* sValue = (char*)"string Value"; OUString wValue("unicode Value"); @@ -302,7 +302,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 76"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 76.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 76.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77"); @@ -316,14 +316,14 @@ void test_merge() REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 27, "testMerge error 80"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); + REG_ENSURE(strcmp((const char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81"); REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 11, "testMerge error 82"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "1234567890") == 0, "testMerge error 82.b)"); + REG_ENSURE(strcmp((const char*)Value, "1234567890") == 0, "testMerge error 82.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83"); @@ -337,7 +337,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 86"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 86.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 86.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87"); @@ -354,7 +354,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 92"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 92.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 92.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93"); @@ -368,7 +368,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 19, "testMerge error 96"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); + REG_ENSURE(strcmp((const char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97"); @@ -380,7 +380,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 100"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 100.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 100.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101"); diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index 064eb40137a2..8b9531194c9b 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -491,15 +491,15 @@ void test_registry_CppApi() REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8d"); - sal_Char* Value=(sal_Char*)"My first value"; + char* Value=(char*)"My first value"; REG_ENSURE(!rootKey.setValue(OUString("mySecondKey"), RegValueType::STRING, Value, 18), "test_registry_CppApi error 9"); RegValueType valueType; sal_uInt32 valueSize; - sal_Char* readValue; + char* readValue; REG_ENSURE(!rootKey.getValueInfo(OUString("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a"); - readValue = (sal_Char*)std::malloc(valueSize); + readValue = (char*)std::malloc(valueSize); REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10"); REG_ENSURE(valueType == RegValueType::STRING, "test_registry_CppApi error 11"); @@ -507,18 +507,18 @@ void test_registry_CppApi() REG_ENSURE(strcmp(readValue, Value) == 0, "test_registry_CppApi error 13"); std::free(readValue); - const sal_Char* pList[3]; - const sal_Char* n1= "Hello"; - const sal_Char* n2= "now I"; - const sal_Char* n3= "come"; + const char* pList[3]; + const char* n1= "Hello"; + const char* n2= "now I"; + const char* n3= "come"; pList[0]=n1; pList[1]=n2; pList[2]=n3; - REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); + REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (char**)pList, 3), "test_registry_CppApi error 13a"); - RegistryValueList valueList; + RegistryValueList valueList; REG_ENSURE(!rootKey.getStringListValue(OUString("myFourthKey"), valueList), "test_registry_CppApi error 13b"); REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c"); -- cgit