remove OUString wrap for string literals

For some functions and all kinds of Exceptions.

CannotConvertException
CloseVetoException
DisposedException
EmptyUndoStackException
ErrorCodeIOException
Exception
GridInvalidDataException
GridInvalidModelException
IOException
IllegalAccessException
IllegalArgumentException
IllegalTypeException
IndexOutOfBoundsException
NoMasterException
NoSuchElementException
NoSupportException
PropertyVetoException
RuntimeException
SAXException
ScannerException
StorageWrappedTargetException
UnsupportedFlavorException
VetoException
WrappedTargetException
ZipIOException
throwGenericSQLException
throwIllegallArgumentException

createInstance
createInstanceWithContext
forName
getByName
getPackageManager
getPropertyValue
getUnpackedValueOrDefault
getValueByName
hasPropertyByName
openKey
setName
setPropertyValue
supportsService

bash command:

for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx'
	| cut -d ':' -f1 | sort -u
	| xargs sed -i
		-e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g"
		-e "s/\($i.*\)\"+ /\1\" + /g";
done

Change-Id: Iaf8e641b0abf28c082906014f87a183517630535
Reviewed-on: https://gerrit.libreoffice.org/4624
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

2 files changed, 51 insertions, 51 deletions

diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index f1b063c0d4e7..0982d28d1606 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -188,102 +188,102 @@ void test_merge()
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1), "testMerge error 5");
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 5");
 
-    REG_ENSURE(!key1.openKey(OUString("MergeKey1"), mkey1), "testMerge error 6");
+    REG_ENSURE(!key1.openKey("MergeKey1", mkey1), "testMerge error 6");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 7");
 
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey1"), mkey1), "testMerge error 8");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey1", mkey1), "testMerge error 8");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 9");
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), mkey1), "testMerge error 10");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey1/KeyWithLongValue", mkey1), "testMerge error 10");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 11");
 
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey2"), mkey1), "testMerge error 12");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey2", mkey1), "testMerge error 12");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 13");
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), mkey1), "testMerge error 14");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey2/KeyWithStringValue", mkey1), "testMerge error 14");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 15");
 
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey3"), mkey1), "testMerge error 16");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey3", mkey1), "testMerge error 16");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 17");
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), mkey1), "testMerge error 18");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue", mkey1), "testMerge error 18");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 19");
 
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey4"), mkey1), "testMerge error 20");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey4", mkey1), "testMerge error 20");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 21");
-    REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), mkey1), "testMerge error 22");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey4/KeyWithBinaryValue", mkey1), "testMerge error 22");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 23");
 
     REG_ENSURE(!key1.closeKey(), "testMerge error 24");
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key2), "testMerge error 25");
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key2), "testMerge error 25");
 
-    REG_ENSURE(!key2.openKey(OUString("MergeKey2"), mkey2), "testMerge error 26");
+    REG_ENSURE(!key2.openKey("MergeKey2", mkey2), "testMerge error 26");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 27");
 
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey1"), mkey2), "testMerge error 28");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey1", mkey2), "testMerge error 28");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 29");
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), mkey2), "testMerge error 30");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey1/KeyWithBinaryValue", mkey2), "testMerge error 30");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 31");
 
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey2"), mkey2), "testMerge error 31");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey2", mkey2), "testMerge error 31");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 33");
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), mkey2), "testMerge error 34");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue", mkey2), "testMerge error 34");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 35");
 
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey3"), mkey2), "testMerge error 36");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey3", mkey2), "testMerge error 36");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 37");
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), mkey2), "testMerge error 38");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey3/KeyWithStringValue", mkey2), "testMerge error 38");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 39");
 
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey4"), mkey2), "testMerge error 40");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey4", mkey2), "testMerge error 40");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 41");
-    REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), mkey2), "testMerge error 42");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey4/KeyWithLongValue", mkey2), "testMerge error 42");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 43");
 
     REG_ENSURE(!key2.closeKey(), "testMerge error 44");
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1u2), "testMerge error 40");
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1u2), "testMerge error 40");
 
-    REG_ENSURE(!key1u2.openKey(OUString("MergeKey1u2"), mkey1u2), "testMerge error 41");
+    REG_ENSURE(!key1u2.openKey("MergeKey1u2", mkey1u2), "testMerge error 41");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 42");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey11"), mkey1u2), "testMerge error 43");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey11", mkey1u2), "testMerge error 43");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 44");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), mkey1u2), "testMerge error 45");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey11/KeyWithLongValue", mkey1u2), "testMerge error 45");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 46");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey12"), mkey1u2), "testMerge error 47");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey12", mkey1u2), "testMerge error 47");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 48");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), mkey1u2), "testMerge error 49");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey12/KeyWithStringValue", mkey1u2), "testMerge error 49");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 50");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey13"), mkey1u2), "testMerge error 51");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey13", mkey1u2), "testMerge error 51");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 52");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), mkey1u2), "testMerge error 53");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue", mkey1u2), "testMerge error 53");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 54");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey21"), mkey1u2), "testMerge error 55");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey21", mkey1u2), "testMerge error 55");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 56");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), mkey1u2), "testMerge error 57");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue", mkey1u2), "testMerge error 57");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 58");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey22"), mkey1u2), "testMerge error 59");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey22", mkey1u2), "testMerge error 59");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 60");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), mkey1u2), "testMerge error 61");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey22/KeyWithLongValue", mkey1u2), "testMerge error 61");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 62");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey23"), mkey1u2), "testMerge error 63");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey23", mkey1u2), "testMerge error 63");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 64");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), mkey1u2), "testMerge error 65");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey23/KeyWithStringValue", mkey1u2), "testMerge error 65");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 66");
 
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK12SubKey1u2"), mkey1u2), "testMerge error 67");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK12SubKey1u2", mkey1u2), "testMerge error 67");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 68");
-    REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), mkey1u2), "testMerge error 69");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue", mkey1u2), "testMerge error 69");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 70");
 
     REG_ENSURE(!key1u2.closeKey(), "testMerge error 71");
@@ -295,7 +295,7 @@ void test_merge()
     sal_Int32           int32Value;
     sal_uInt8           *Value;
 
-    REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1), "testMerge error 72");
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 72");
 
     REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 73");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 74");
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 87b06d04ce93..95adc988bc63 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -388,8 +388,8 @@ void test_registry_CppApi()
 
     REG_ENSURE(!key5.createKey(OUString("1"), key4), "test_registry_CppApi error 6b");
     REG_ENSURE(!key4.createKey(OUString("2"), key3), "test_registry_CppApi error 6c");
-    REG_ENSURE(!key5.openKey(OUString("1"), key4), "test_registry_CppApi error 6d");
-    REG_ENSURE(!rootKey.openKey(OUString("/myThirdKey/1"), key4), "test_registry_CppApi error 6e");
+    REG_ENSURE(!key5.openKey("1", key4), "test_registry_CppApi error 6d");
+    REG_ENSURE(!rootKey.openKey("/myThirdKey/1", key4), "test_registry_CppApi error 6e");
     REG_ENSURE(key4.getName() == "/myThirdKey/1", "test_registry_CppApi error 6f");
 
     REG_ENSURE(!rootKey.createKey(OUString("myFourthKey"), key6), "test_registry_CppApi error 7");
@@ -426,22 +426,22 @@ void test_registry_CppApi()
     REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7k1");
     delete pSubKeyNames;
 
-    REG_ENSURE(!rootKey.openKey(OUString("/mySixthKey/myFirstLink"), key6), "test_registry_CppApi error 7l");
+    REG_ENSURE(!rootKey.openKey("/mySixthKey/myFirstLink", key6), "test_registry_CppApi error 7l");
 //    REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m");
 
-    REG_ENSURE(!rootKey.openKey(OUString("myFifthKey"), key6), "test_registry_CppApi error 7m1");
+    REG_ENSURE(!rootKey.openKey("myFifthKey", key6), "test_registry_CppApi error 7m1");
     REG_ENSURE(!key6.createLink(OUString("mySecondLink"),
                                  OUString("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2");
 
-    REG_ENSURE(!rootKey.openKey(OUString("/myFifthKey/mySecondLink"), key6), "test_registry_CppApi error 7m3");
+    REG_ENSURE(!rootKey.openKey("/myFifthKey/mySecondLink", key6), "test_registry_CppApi error 7m3");
 //    REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m4");
 
     REG_ENSURE(!rootKey.createKey(OUString("/myFifthKey/mySecondLink/myFirstLinkSubKey"), key7), "test_registry_CppApi error 7m5");
     REG_ENSURE(key7.getName() == "/myFourthKey/X/myFirstLinkSubKey", "test_registry_CppApi error 7m6");
 
     REG_ENSURE(!key7.createLink(OUString("myThirdLink"), OUString("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m7");
-    REG_ENSURE(!rootKey.openKey(OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7), "test_registry_CppApi error 7m8");
-//    REG_ENSURE(!key7.openKey(OUString("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink"), key6), "test_registry_CppApi error 7m9");
+    REG_ENSURE(!rootKey.openKey("/myFourthKey/X/myFirstLinkSubKey/myThirdLink", key7), "test_registry_CppApi error 7m8");
+//    REG_ENSURE(!key7.openKey("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink", key6), "test_registry_CppApi error 7m9");
 //    REG_ENSURE(key7.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m10");
     REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7m11");
 
@@ -451,7 +451,7 @@ void test_registry_CppApi()
                                     OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")),
                                     "test_registry_CppApi error 7m13");
 
-//    REG_ENSURE(rootKey.openKey(OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7) == REG_DETECT_RECURSION,
+//    REG_ENSURE(rootKey.openKey("/myFourthKey/X/myFirstLinkSubKey/myThirdLink", key7) == REG_DETECT_RECURSION,
 //                "test_registry_CppApi error 7m14");
 
 //    REG_ENSURE(key7.closeKey() == REG_INVALID_KEY, "test_registry_CppApi error 7m11");
@@ -483,11 +483,11 @@ void test_registry_CppApi()
     REG_ENSURE(!rootKey.createKey(OUString("/TEST"), key8), "test_registry_CppApi error 8");
     REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child1"), key8), "test_registry_CppApi error 8a");
     REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child2"), key8), "test_registry_CppApi error 8a1");
-    REG_ENSURE(!rootKey.openKey(OUString("/TEST"), key9), "test_registry_CppApi error 8b");
+    REG_ENSURE(!rootKey.openKey("/TEST", key9), "test_registry_CppApi error 8b");
     REG_ENSURE(!key8.closeKey() && !key9.closeKey(),  "test_registry_CppApi error 8b1");
-    REG_ENSURE(!rootKey.openKey(OUString("/TEST"), key8), "test_registry_CppApi error 8b");
+    REG_ENSURE(!rootKey.openKey("/TEST", key8), "test_registry_CppApi error 8b");
     REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8c");
-    REG_ENSURE(!rootKey.openKey(OUString("TEST"), key8), "test_registry_CppApi error 8c");
+    REG_ENSURE(!rootKey.openKey("TEST", key8), "test_registry_CppApi error 8c");
     REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8d");
 
 
@@ -582,13 +582,13 @@ void test_registry_CppApi()
     REG_ENSURE(!rootKey.deleteKey(OUString("myFirstKey")), "test_registry_CppApi error 15");
 
     REG_ENSURE(!key2.closeKey(), "test_registry_CppApi error 16");
-    REG_ENSURE(!rootKey.openKey(OUString("mySecondKey"), key2), "test_registry_CppApi error 17");
+    REG_ENSURE(!rootKey.openKey("mySecondKey", key2), "test_registry_CppApi error 17");
 
     REG_ENSURE(!key5.closeKey(), "test_registry_CppApi error 18");
 
     REG_ENSURE(!rootKey.deleteKey(OUString("myThirdKey")), "test_registry_CppApi error 19");
 
-    REG_ENSURE(rootKey.openKey(OUString("myThirdKey"), key5), "test_registry_CppApi error 20");
+    REG_ENSURE(rootKey.openKey("myThirdKey", key5), "test_registry_CppApi error 20");
 
     REG_ENSURE(!key2.closeKey() &&
                 !rootKey.closeKey(),  "test_registry_CppApi error 21");
@@ -648,7 +648,7 @@ void test_registry_CppApi()
 
     REG_ENSURE(!key3.closeKey(), "test_registry_CppApi error 43");
 
-    REG_ENSURE(!rootKey.openKey(OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey"), key1),
+    REG_ENSURE(!rootKey.openKey("/allFromTest3/reg2FirstKey/reg2FirstSubKey", key1),
                 "test_registry_CppApi error 43.a)");
     REG_ENSURE(!rootKey.deleteKey(OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), "test_registry_CppApi error 44");
     REG_ENSURE(key1.getValueInfo(OUString(), &valueType, &valueSize) == REG_INVALID_KEY,