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

loplugin:ostr in cppu,cppuhelper

Browse source 
Change-Id: I15c00d7a87396d07be2d10a0311f308a93e8eec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166751
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-04-26 15:25:01 +02:00
parent 87e0feafd3
commit 60728712f0
26 changed files with 275 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cppu/qa/cppumaker/test_cppumaker.cxx
View file

@ -474,8 +474,7 @@ void Test::testBigStruct() {
void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
OUString(
"test.codemaker.cppumaker.Struct<char,short>"),
u"test.codemaker.cppumaker.Struct<char,short>"_ustr,
(css::uno::Any(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
@ -494,7 +493,7 @@ void Test::testExceptions() {
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
"abc", nullptr, 1,
u"abc"_ustr, nullptr, 1,
css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
@ -504,7 +503,7 @@ void Test::testExceptions() {
e13 = e11;
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
"abc", nullptr, 1,
u"abc"_ustr, nullptr, 1,
css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);

84
cppu/qa/test_any.cxx
View file

@ -284,9 +284,9 @@ void Test::testVoid() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -393,9 +393,9 @@ void Test::testBoolean() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -504,9 +504,9 @@ void Test::testByte() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -615,9 +615,9 @@ void Test::testShort() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -728,9 +728,9 @@ void Test::testUnsignedShort() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -839,9 +839,9 @@ void Test::testLong() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -950,9 +950,9 @@ void Test::testUnsignedLong() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1061,9 +1061,9 @@ void Test::testHyper() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1172,9 +1172,9 @@ void Test::testUnsignedHyper() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1283,9 +1283,9 @@ void Test::testFloat() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1394,9 +1394,9 @@ void Test::testDouble() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1506,9 +1506,9 @@ void Test::testChar() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'1', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1553,7 +1553,7 @@ void Test::testChar() {
}
void Test::testString() {
css::uno::Any a(OUString("1"));
css::uno::Any a(u"1"_ustr);
CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<OUString>::get()));
{
bool b = true;
@ -1617,9 +1617,9 @@ void Test::testString() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", (a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("1"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"1"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1728,9 +1728,9 @@ void Test::testType() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1840,9 +1840,9 @@ void Test::testSequence() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -1970,9 +1970,9 @@ void Test::testEnum() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -2086,9 +2086,9 @@ void Test::testStruct() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -2154,7 +2154,7 @@ void Test::testStruct() {
void Test::testPoly() {
css::uno::Any a;
a <<= Poly< css::uno::Sequence< ::sal_Unicode > >();
CPPUNIT_ASSERT_EQUAL_MESSAGE( "type name", OUString("Poly<[]char>"), a.getValueType().getTypeName() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "type name", u"Poly<[]char>"_ustr, a.getValueType().getTypeName() );
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"constructor",
css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >()), a);
@ -2228,9 +2228,9 @@ void Test::testException() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -2364,9 +2364,9 @@ void Test::testInterface() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@ -2496,9 +2496,9 @@ void Test::testNull() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());

58
cppu/qa/test_unotype.cxx
View file

@ -101,67 +101,67 @@ void Test::testUnoType() {
css::uno::Type t;
t = cppu::UnoType<cppu::UnoVoidType>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_VOID, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("void"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"void"_ustr, t.getTypeName());
CPPUNIT_ASSERT(bool(cppu::UnoType<void>::get() == t));
t = cppu::UnoType<bool>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BOOLEAN, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("boolean"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"boolean"_ustr, t.getTypeName());
CPPUNIT_ASSERT(bool(cppu::UnoType<sal_Bool>::get() == t));
t = cppu::UnoType<sal_Int8>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BYTE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("byte"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"byte"_ustr, t.getTypeName());
t = cppu::UnoType<sal_Int16>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SHORT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("short"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"short"_ustr, t.getTypeName());
t = cppu::UnoType<cppu::UnoUnsignedShortType>::get();
CPPUNIT_ASSERT_EQUAL(
css::uno::TypeClass_UNSIGNED_SHORT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("unsigned short"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"unsigned short"_ustr, t.getTypeName());
t = cppu::UnoType<sal_Int32>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_LONG, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("long"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"long"_ustr, t.getTypeName());
t = cppu::UnoType<sal_uInt32>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_LONG, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("unsigned long"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"unsigned long"_ustr, t.getTypeName());
t = cppu::UnoType<sal_Int64>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_HYPER, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("hyper"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"hyper"_ustr, t.getTypeName());
t = cppu::UnoType<sal_uInt64>::get();
CPPUNIT_ASSERT_EQUAL(
css::uno::TypeClass_UNSIGNED_HYPER, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("unsigned hyper"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"unsigned hyper"_ustr, t.getTypeName());
t = cppu::UnoType<float>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_FLOAT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("float"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"float"_ustr, t.getTypeName());
t = cppu::UnoType<double>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_DOUBLE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("double"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"double"_ustr, t.getTypeName());
t = cppu::UnoType<cppu::UnoCharType>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_CHAR, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("char"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"char"_ustr, t.getTypeName());
t = cppu::UnoType<OUString>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRING, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("string"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"string"_ustr, t.getTypeName());
t = cppu::UnoType<css::uno::Type>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_TYPE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("type"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"type"_ustr, t.getTypeName());
t = cppu::UnoType<css::uno::Any>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ANY, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("any"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"any"_ustr, t.getTypeName());
t = cppu::UnoType<cppu::UnoSequenceType<sal_Int8>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[]byte"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[]byte"_ustr, t.getTypeName());
CPPUNIT_ASSERT(bool(cppu::UnoType<css::uno::Sequence<sal_Int8>>::get() == t));
t = cppu::UnoType<cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[]unsigned short"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[]unsigned short"_ustr, t.getTypeName());
t = cppu::UnoType<cppu::UnoSequenceType<cppu::UnoCharType>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[]char"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[]char"_ustr, t.getTypeName());
t = cppu::UnoType<
cppu::UnoSequenceType<cppu::UnoSequenceType<sal_Int8>>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[][]byte"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[][]byte"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(
cppu::UnoType<css::uno::Sequence<css::uno::Sequence<sal_Int8>>>::get(),
t);
@ -169,43 +169,43 @@ void Test::testUnoType() {
cppu::UnoSequenceType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[][]unsigned short"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[][]unsigned short"_ustr, t.getTypeName());
t = cppu::UnoType<
cppu::UnoSequenceType<cppu::UnoSequenceType<cppu::UnoCharType>>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[][]char"), t.getTypeName());
CPPUNIT_ASSERT_EQUAL(u"[][]char"_ustr, t.getTypeName());
t = cppu::UnoType<css::uno::TypeClass>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ENUM, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.uno.TypeClass"), t.getTypeName());
u"com.sun.star.uno.TypeClass"_ustr, t.getTypeName());
t = cppu::UnoType<css::lang::EventObject>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.lang.EventObject"), t.getTypeName());
u"com.sun.star.lang.EventObject"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<DerivedStruct1>::get(), t);
t = cppu::UnoType<css::beans::PropertyChangeEvent>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.beans.PropertyChangeEvent"), t.getTypeName());
u"com.sun.star.beans.PropertyChangeEvent"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<DerivedStruct2>::get(), t);
t = cppu::UnoType<css::beans::Optional<sal_Int8>>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.beans.Optional<byte>"), t.getTypeName());
u"com.sun.star.beans.Optional<byte>"_ustr, t.getTypeName());
t = cppu::UnoType<css::uno::Exception>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.uno.Exception"), t.getTypeName());
u"com.sun.star.uno.Exception"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<DerivedException1>::get(), t);
t = cppu::UnoType<css::uno::RuntimeException>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.uno.RuntimeException"), t.getTypeName());
u"com.sun.star.uno.RuntimeException"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<DerivedException2>::get(), t);
t = cppu::UnoType<css::uno::XInterface>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.uno.XInterface"), t.getTypeName());
u"com.sun.star.uno.XInterface"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(
cppu::UnoType<css::uno::Reference<css::uno::XInterface>>::get(), t);
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<DerivedInterface1>::get(), t);
@ -214,7 +214,7 @@ void Test::testUnoType() {
t = cppu::UnoType<css::uno::XComponentContext>::get();
CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
OUString("com.sun.star.uno.XComponentContext"), t.getTypeName());
u"com.sun.star.uno.XComponentContext"_ustr, t.getTypeName());
CPPUNIT_ASSERT_EQUAL(
cppu::UnoType<css::uno::Reference<css::uno::XComponentContext>>::get(),
t);

17
cppu/qa/typelib.cxx
View file

@ -59,9 +59,9 @@ public:
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), t->nDefaultEnumValue);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), t->nEnumValues);
CPPUNIT_ASSERT(t->ppEnumNames != nullptr);
CPPUNIT_ASSERT_EQUAL(OUString("METHOD"), OUString::unacquired(&t->ppEnumNames[0]));
CPPUNIT_ASSERT_EQUAL(OUString("PROPERTY"), OUString::unacquired(&t->ppEnumNames[1]));
CPPUNIT_ASSERT_EQUAL(OUString("UNKNOWN"), OUString::unacquired(&t->ppEnumNames[2]));
CPPUNIT_ASSERT_EQUAL(u"METHOD"_ustr, OUString::unacquired(&t->ppEnumNames[0]));
CPPUNIT_ASSERT_EQUAL(u"PROPERTY"_ustr, OUString::unacquired(&t->ppEnumNames[1]));
CPPUNIT_ASSERT_EQUAL(u"UNKNOWN"_ustr, OUString::unacquired(&t->ppEnumNames[2]));
CPPUNIT_ASSERT(t->pEnumValues != nullptr);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), t->pEnumValues[0]);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), t->pEnumValues[1]);
@ -110,10 +110,10 @@ public:
CPPUNIT_ASSERT_EQUAL(t2, css::uno::Type(t->aBase.ppTypeRefs[1]));
CPPUNIT_ASSERT_EQUAL(t3, css::uno::Type(t->aBase.ppTypeRefs[2]));
CPPUNIT_ASSERT(t->aBase.ppMemberNames != nullptr);
CPPUNIT_ASSERT_EQUAL(OUString("Finish"), OUString::unacquired(&t->aBase.ppMemberNames[0]));
CPPUNIT_ASSERT_EQUAL(OUString("ErrorMessage"),
CPPUNIT_ASSERT_EQUAL(u"Finish"_ustr, OUString::unacquired(&t->aBase.ppMemberNames[0]));
CPPUNIT_ASSERT_EQUAL(u"ErrorMessage"_ustr,
OUString::unacquired(&t->aBase.ppMemberNames[1]));
CPPUNIT_ASSERT_EQUAL(OUString("Return"), OUString::unacquired(&t->aBase.ppMemberNames[2]));
CPPUNIT_ASSERT_EQUAL(u"Return"_ustr, OUString::unacquired(&t->aBase.ppMemberNames[2]));
CPPUNIT_ASSERT(t->pParameterizedTypes == nullptr);
// `offsets` and `typerefs` must still be valid:
CPPUNIT_ASSERT_EQUAL(t->aBase.pMemberOffsets[0], offsets[0]);
@ -164,9 +164,8 @@ public:
CPPUNIT_ASSERT_EQUAL(t1, css::uno::Type(t->aBase.ppTypeRefs[0]));
CPPUNIT_ASSERT_EQUAL(t2, css::uno::Type(t->aBase.ppTypeRefs[1]));
CPPUNIT_ASSERT(t->aBase.ppMemberNames != nullptr);
CPPUNIT_ASSERT_EQUAL(OUString("IsPresent"),
OUString::unacquired(&t->aBase.ppMemberNames[0]));
CPPUNIT_ASSERT_EQUAL(OUString("Value"), OUString::unacquired(&t->aBase.ppMemberNames[1]));
CPPUNIT_ASSERT_EQUAL(u"IsPresent"_ustr, OUString::unacquired(&t->aBase.ppMemberNames[0]));
CPPUNIT_ASSERT_EQUAL(u"Value"_ustr, OUString::unacquired(&t->aBase.ppMemberNames[1]));
CPPUNIT_ASSERT(t->pParameterizedTypes != nullptr);
CPPUNIT_ASSERT_EQUAL(param[0], t->pParameterizedTypes[0]);
CPPUNIT_ASSERT_EQUAL(param[1], t->pParameterizedTypes[1]);

12
cppu/source/threadpool/current.cxx
View file

@ -40,10 +40,10 @@ namespace cppu
static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
{
static typelib_InterfaceTypeDescription* s_type_XCurrentContext = []() {
OUString sTypeName("com.sun.star.uno.XCurrentContext");
OUString sTypeName(u"com.sun.star.uno.XCurrentContext"_ustr);
typelib_InterfaceTypeDescription* pTD = nullptr;
typelib_TypeDescriptionReference* pMembers[1] = { nullptr };
OUString sMethodName0("com.sun.star.uno.XCurrentContext::getValueByName");
OUString sMethodName0(u"com.sun.star.uno.XCurrentContext::getValueByName"_ustr);
typelib_typedescriptionreference_new(&pMembers[0], typelib_TypeClass_INTERFACE_METHOD,
sMethodName0.pData);
typelib_typedescription_newInterface(
@ -55,17 +55,17 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
typelib_InterfaceMethodTypeDescription* pMethod = nullptr;
typelib_Parameter_Init aParameters[1];
OUString sParamName0("Name");
OUString sParamType0("string");
OUString sParamName0(u"Name"_ustr);
OUString sParamType0(u"string"_ustr);
aParameters[0].pParamName = sParamName0.pData;
aParameters[0].eTypeClass = typelib_TypeClass_STRING;
aParameters[0].pTypeName = sParamType0.pData;
aParameters[0].bIn = true;
aParameters[0].bOut = false;
rtl_uString* pExceptions[1];
OUString sExceptionName0("com.sun.star.uno.RuntimeException");
OUString sExceptionName0(u"com.sun.star.uno.RuntimeException"_ustr);
pExceptions[0] = sExceptionName0.pData;
OUString sReturnType0("any");
OUString sReturnType0(u"any"_ustr);
typelib_typedescription_newInterfaceMethod(&pMethod, 3, false, sMethodName0.pData,
typelib_TypeClass_ANY, sReturnType0.pData, 1,
aParameters, 1, pExceptions);

36
cppu/source/typelib/static_types.cxx
View file

@ -132,7 +132,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// type
if (! s_aTypes[typelib_TypeClass_TYPE])
{
OUString sTypeName("type");
OUString sTypeName(u"type"_ustr);
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_TYPE], typelib_TypeClass_TYPE, sTypeName.pData );
// another static ref:
@ -141,7 +141,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// any
if (! s_aTypes[typelib_TypeClass_ANY])
{
OUString sTypeName("any");
OUString sTypeName(u"any"_ustr);
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_ANY], typelib_TypeClass_ANY, sTypeName.pData );
// another static ref:
@ -150,7 +150,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// string
if (! s_aTypes[typelib_TypeClass_STRING])
{
OUString sTypeName("string");
OUString sTypeName(u"string"_ustr);
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_STRING], typelib_TypeClass_STRING, sTypeName.pData );
// another static ref:
@ -159,18 +159,18 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// XInterface
if (! s_aTypes[typelib_TypeClass_INTERFACE])
{
OUString sTypeName("com.sun.star.uno.XInterface");
OUString sTypeName(u"com.sun.star.uno.XInterface"_ustr);
typelib_InterfaceTypeDescription * pTD = nullptr;
typelib_TypeDescriptionReference * pMembers[3] = { nullptr,nullptr,nullptr };
OUString sMethodName0("com.sun.star.uno.XInterface::queryInterface");
OUString sMethodName0(u"com.sun.star.uno.XInterface::queryInterface"_ustr);
::typelib_typedescriptionreference_new(
&pMembers[0], typelib_TypeClass_INTERFACE_METHOD, sMethodName0.pData );
OUString sMethodName1("com.sun.star.uno.XInterface::acquire");
OUString sMethodName1(u"com.sun.star.uno.XInterface::acquire"_ustr);
::typelib_typedescriptionreference_new(
&pMembers[1], typelib_TypeClass_INTERFACE_METHOD, sMethodName1.pData );
OUString sMethodName2("com.sun.star.uno.XInterface::release");
OUString sMethodName2(u"com.sun.star.uno.XInterface::release"_ustr);
::typelib_typedescriptionreference_new(
&pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
@ -192,16 +192,16 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
assert( ! s_aTypes[typelib_TypeClass_EXCEPTION] );
{
typelib_TypeDescription * pTD1 = nullptr;
OUString sTypeName1("com.sun.star.uno.Exception");
OUString sTypeName1(u"com.sun.star.uno.Exception"_ustr);
typelib_CompoundMember_Init aMembers[2];
OUString sMemberType0("string");
OUString sMemberName0("Message");
OUString sMemberType0(u"string"_ustr);
OUString sMemberName0(u"Message"_ustr);
aMembers[0].eTypeClass = typelib_TypeClass_STRING;
aMembers[0].pTypeName = sMemberType0.pData;
aMembers[0].pMemberName = sMemberName0.pData;
OUString sMemberType1("com.sun.star.uno.XInterface");
OUString sMemberName1("Context");
OUString sMemberType1(u"com.sun.star.uno.XInterface"_ustr);
OUString sMemberName1(u"Context"_ustr);
aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE;
aMembers[1].pTypeName = sMemberType1.pData;
aMembers[1].pMemberName = sMemberName1.pData;
@ -215,7 +215,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// another static ref:
++s_aTypes[typelib_TypeClass_EXCEPTION]->nStaticRefCount;
// RuntimeException
OUString sTypeName2("com.sun.star.uno.RuntimeException");
OUString sTypeName2(u"com.sun.star.uno.RuntimeException"_ustr);
::typelib_typedescription_new(
&pTD1, typelib_TypeClass_EXCEPTION, sTypeName2.pData, s_aTypes[typelib_TypeClass_EXCEPTION], 0, nullptr );
::typelib_typedescription_register( &pTD1 );
@ -224,24 +224,24 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
// XInterface members
typelib_InterfaceMethodTypeDescription * pMethod = nullptr;
typelib_Parameter_Init aParameters[1];
OUString sParamName0("aType");
OUString sParamType0("type");
OUString sParamName0(u"aType"_ustr);
OUString sParamType0(u"type"_ustr);
aParameters[0].pParamName = sParamName0.pData;
aParameters[0].eTypeClass = typelib_TypeClass_TYPE;
aParameters[0].pTypeName = sParamType0.pData;
aParameters[0].bIn = true;
aParameters[0].bOut = false;
rtl_uString * pExceptions[1];
OUString sExceptionName0("com.sun.star.uno.RuntimeException");
OUString sExceptionName0(u"com.sun.star.uno.RuntimeException"_ustr);
pExceptions[0] = sExceptionName0.pData;
OUString sReturnType0("any");
OUString sReturnType0(u"any"_ustr);
typelib_typedescription_newInterfaceMethod(
&pMethod, 0, false, sMethodName0.pData,
typelib_TypeClass_ANY, sReturnType0.pData,
1, aParameters, 1, pExceptions );
::typelib_typedescription_register( reinterpret_cast<typelib_TypeDescription**>(&pMethod) );
OUString sReturnType1("void");
OUString sReturnType1(u"void"_ustr);
::typelib_typedescription_newInterfaceMethod(
&pMethod, 1, true, sMethodName1.pData,
typelib_TypeClass_VOID, sReturnType1.pData, 0, nullptr, 0, nullptr );

30
cppu/source/typelib/typelib.cxx
View file

@ -1879,35 +1879,35 @@ extern "C" void SAL_CALL typelib_typedescription_getByName(
bInited = true;
typelib_TypeDescription * pType = nullptr;
typelib_typedescription_new( &pType, typelib_TypeClass_TYPE, OUString("type").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_TYPE, u"type"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_VOID, OUString("void").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_VOID, u"void"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_BOOLEAN, OUString("boolean").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_BOOLEAN, u"boolean"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_CHAR, OUString("char").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_CHAR, u"char"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_BYTE, OUString("byte").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_BYTE, u"byte"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_STRING, OUString("string").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_STRING, u"string"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_SHORT, OUString("short").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_SHORT, u"short"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_SHORT, OUString("unsigned short").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_SHORT, u"unsigned short"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_LONG, OUString("long").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_LONG, u"long"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_LONG, OUString("unsigned long").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_LONG, u"unsigned long"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_HYPER, OUString("hyper").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_HYPER, u"hyper"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_HYPER, OUString("unsigned hyper").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_UNSIGNED_HYPER, u"unsigned hyper"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_FLOAT, OUString("float").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_FLOAT, u"float"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_DOUBLE, OUString("double").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_DOUBLE, u"double"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_new( &pType, typelib_TypeClass_ANY, OUString("any").pData, nullptr, 0, nullptr );
typelib_typedescription_new( &pType, typelib_TypeClass_ANY, u"any"_ustr.pData, nullptr, 0, nullptr );
typelib_typedescription_register( &pType );
typelib_typedescription_release( pType );
}

2
cppu/source/uno/EnvStack.cxx
View file

@ -135,7 +135,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl
}
else
{
OUString uno_envDcp(UNO_LB_UNO);
OUString uno_envDcp(u"" UNO_LB_UNO ""_ustr);
uno_getEnvironment(ppEnv, uno_envDcp.pData, nullptr);
}
}

2
cppu/source/uno/cascade_mapping.cxx
View file

@ -208,7 +208,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
if (pAddPurpose && pAddPurpose->length)
return;
OUString uno_envType(UNO_LB_UNO);
OUString uno_envType(u"" UNO_LB_UNO ""_ustr);
OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName);
OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName);

2
cppu/source/uno/lbenv.cxx
View file

@ -1032,7 +1032,7 @@ bool loadEnv(OUString const & cLibStem,
}
uno_initEnvironmentFunc fpInit = reinterpret_cast<uno_initEnvironmentFunc>(aMod.getSymbol(UNO_INIT_ENVIRONMENT));
uno_initEnvironmentFunc fpInit = reinterpret_cast<uno_initEnvironmentFunc>(aMod.getSymbol(u"" UNO_INIT_ENVIRONMENT ""_ustr));
if (!fpInit)
return false;

4
cppu/source/uno/lbmap.cxx
View file

@ -448,7 +448,7 @@ static Mapping loadExternalMapping(
if (bModule)
{
uno_ext_getMappingFunc fpGetMapFunc =
reinterpret_cast<uno_ext_getMappingFunc>(aModule.getSymbol( UNO_EXT_GETMAPPING ));
reinterpret_cast<uno_ext_getMappingFunc>(aModule.getSymbol( u"" UNO_EXT_GETMAPPING ""_ustr ));
if (fpGetMapFunc)
{
@ -518,7 +518,7 @@ static Mapping getMediateMapping(
// backwards: from dest to source of mapping chain
// connect to uno
OUString aUnoEnvTypeName( UNO_LB_UNO );
OUString aUnoEnvTypeName( u"" UNO_LB_UNO ""_ustr );
if (rTo.getTypeName() == aUnoEnvTypeName) // to is uno
{
aUno = rTo;

4
cppuhelper/qa/misc/test_misc.cxx
View file

@ -32,7 +32,7 @@ void Test::testCatchThrow()
css::uno::Any aSavedException;
try
{
throw css::uno::RuntimeException("RuntimeException");
throw css::uno::RuntimeException(u"RuntimeException"_ustr);
}
catch (const css::uno::RuntimeException&)
{
@ -60,7 +60,7 @@ void Test::testgetCaughtException()
aSavedException; /// exception caught during unzipping is saved to be thrown during reading
try
{
throw css::uno::RuntimeException("RuntimeException");
throw css::uno::RuntimeException(u"RuntimeException"_ustr);
}
catch (...)
{

6
cppuhelper/source/access_control.cxx
View file

@ -38,7 +38,7 @@ AccessControl::AccessControl( Reference< XComponentContext > const & xContext )
{
if (! (xContext->getValueByName( ACCESS_CONTROLLER_SINGLETON ) >>= m_xController))
{
throw SecurityException( "no access controller!" );
throw SecurityException( u"no access controller!"_ustr );
}
}
@ -48,7 +48,7 @@ AccessControl::AccessControl(
{
if (! m_xController.is())
{
throw SecurityException( "no access controller!" );
throw SecurityException( u"no access controller!"_ustr );
}
}
@ -57,7 +57,7 @@ AccessControl::AccessControl( AccessControl const & ac )
{
if (! m_xController.is())
{
throw SecurityException( "no access controller!" );
throw SecurityException( u"no access controller!"_ustr );
}
}

34
cppuhelper/source/bootstrap.cxx
View file

@ -90,7 +90,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
auto* p1 = cppuhelper_detail_findSofficePath();
if (p1 == nullptr) {
throw BootstrapException(
"no soffice installation found!");
u"no soffice installation found!"_ustr);
}
OUString p2;
#if defined(_WIN32)
@ -106,7 +106,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
if (!bOk)
{
throw BootstrapException(
"bad characters in soffice installation path!");
u"bad characters in soffice installation path!"_ustr);
}
#endif
OUString path;
@ -114,16 +114,16 @@ Reference< XComponentContext > SAL_CALL bootstrap()
osl::FileBase::E_None)
{
throw BootstrapException(
"cannot convert soffice installation path to URL!");
u"cannot convert soffice installation path to URL!"_ustr);
}
if (!path.isEmpty() && !path.endsWith("/")) {
path += "/";
}
OUString uri;
if (!Bootstrap::get("URE_BOOTSTRAP", uri)) {
if (!Bootstrap::get(u"URE_BOOTSTRAP"_ustr, uri)) {
Bootstrap::set(
"URE_BOOTSTRAP",
u"URE_BOOTSTRAP"_ustr,
Bootstrap::encode(
path +
#if defined MACOSX
@ -136,16 +136,16 @@ Reference< XComponentContext > SAL_CALL bootstrap()
Reference< XComponentContext > xLocalContext(
defaultBootstrap_InitialComponentContext() );
if ( !xLocalContext.is() )
throw BootstrapException( "no local component context!" );
throw BootstrapException( u"no local component context!"_ustr );
// create a random pipe name
rtlRandomPool hPool = rtl_random_createPool();
if ( hPool == nullptr )
throw BootstrapException( "cannot create random pool!" );
throw BootstrapException( u"cannot create random pool!"_ustr );
sal_uInt8 bytes[ 16 ];
if ( rtl_random_getBytes( hPool, bytes, std::size( bytes ) )
!= rtl_Random_E_None )
throw BootstrapException( "random pool error!" );
throw BootstrapException( u"random pool error!"_ustr );
rtl_random_destroyPool( hPool );
OUStringBuffer buf("uno");
for (unsigned char byte : bytes)
@ -154,10 +154,10 @@ Reference< XComponentContext > SAL_CALL bootstrap()
// arguments
OUString args [] = {
OUString("--nologo"),
OUString("--nodefault"),
OUString("--norestore"),
OUString("--nolockcheck"),
u"--nologo"_ustr,
u"--nodefault"_ustr,
u"--norestore"_ustr,
u"--nolockcheck"_ustr,
OUString("--accept=pipe,name=" + sPipeName + ";urp;")
};
rtl_uString * ar_args [] = {
@ -184,16 +184,16 @@ Reference< XComponentContext > SAL_CALL bootstrap()
osl_freeProcessHandle( hProcess );
break;
case osl_Process_E_NotFound:
throw BootstrapException( "image not found!" );
throw BootstrapException( u"image not found!"_ustr );
case osl_Process_E_TimedOut:
throw BootstrapException( "timeout occurred!" );
throw BootstrapException( u"timeout occurred!"_ustr );
case osl_Process_E_NoPermission:
throw BootstrapException( "permission denied!" );
throw BootstrapException( u"permission denied!"_ustr );
case osl_Process_E_Unknown:
throw BootstrapException( "unknown error!" );
throw BootstrapException( u"unknown error!"_ustr );
case osl_Process_E_InvalidError:
default:
throw BootstrapException( "unmapped error!" );
throw BootstrapException( u"unmapped error!"_ustr );
}
// create a URL resolver

8
cppuhelper/source/component_context.cxx
View file

@ -380,7 +380,7 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
if ( !m_xSMgr.is() )
{
throw DeploymentException(
"null component context service manager",
u"null component context service manager"_ustr,
static_cast<OWeakObject *>(this) );
}
return m_xSMgr;
@ -446,7 +446,7 @@ void ComponentContext::disposing(std::unique_lock<std::mutex>& rGuard)
uno_Environment ** envs;
sal_Int32 envCount;
uno_getRegisteredEnvironments(
&envs, &envCount, &rtl_allocateMemory, OUString("java").pData);
&envs, &envCount, &rtl_allocateMemory, u"java"_ustr.pData);
assert(envCount >= 0);
assert(envCount == 0 || envs != nullptr);
if (envs) {
@ -502,7 +502,7 @@ ComponentContext::ComponentContext(
// create new smgr based on delegate's one
m_xSMgr.set(
xMgr->createInstanceWithContext(
"com.sun.star.comp.stoc.OServiceManagerWrapper", xDelegate ),
u"com.sun.star.comp.stoc.OServiceManagerWrapper"_ustr, xDelegate ),
UNO_QUERY );
// patch DefaultContext property of new one
Reference< beans::XPropertySet > xProps( m_xSMgr, UNO_QUERY );
@ -510,7 +510,7 @@ ComponentContext::ComponentContext(
if (xProps.is())
{
Reference< XComponentContext > xThis( this );
xProps->setPropertyValue( "DefaultContext", Any( xThis ) );
xProps->setPropertyValue( u"DefaultContext"_ustr, Any( xThis ) );
}
}
catch (...)

18
cppuhelper/source/defaultbootstrap.cxx
View file

@ -54,25 +54,25 @@ cppu::defaultBootstrap_InitialComponentContext(OUString const & iniUri)
}
rtl::Reference smgr(
new cppuhelper::ServiceManager);
smgr->init(getBootstrapVariable(bs, "UNO_SERVICES"));
smgr->init(getBootstrapVariable(bs, u"UNO_SERVICES"_ustr));
rtl::Reference tmgr(new cppuhelper::TypeManager);
tmgr->init(getBootstrapVariable(bs, "UNO_TYPES"));
tmgr->init(getBootstrapVariable(bs, u"UNO_TYPES"_ustr));
std::vector< cppu::ContextEntry_Init > context_values
{
cppu::ContextEntry_Init(
"/singletons/com.sun.star.lang.theServiceManager",
u"/singletons/com.sun.star.lang.theServiceManager"_ustr,
css::uno::Any(
css::uno::Reference< css::uno::XInterface >(
static_cast< cppu::OWeakObject * >(smgr.get()))),
false),
cppu::ContextEntry_Init(
"/singletons/com.sun.star.reflection.theTypeDescriptionManager",
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager"_ustr,
css::uno::Any(
css::uno::Reference< css::uno::XInterface >(
static_cast< cppu::OWeakObject * >(tmgr.get()))),
false),
cppu::ContextEntry_Init( //TODO: from services.rdb?
"/singletons/com.sun.star.util.theMacroExpander",
u"/singletons/com.sun.star.util.theMacroExpander"_ustr,
css::uno::Any(
cppuhelper::detail::create_bootstrap_macro_expander_factory()),
true)
@ -80,13 +80,13 @@ cppu::defaultBootstrap_InitialComponentContext(OUString const & iniUri)
smgr->addSingletonContextEntries(&context_values);
context_values.push_back(
cppu::ContextEntry_Init(
"/services/com.sun.star.security.AccessController/mode",
css::uno::Any(OUString("off")), false));
u"/services/com.sun.star.security.AccessController/mode"_ustr,
css::uno::Any(u"off"_ustr), false));
context_values.push_back(
cppu::ContextEntry_Init(
"/singletons/com.sun.star.security.theAccessController",
u"/singletons/com.sun.star.security.theAccessController"_ustr,
css::uno::Any(
OUString("com.sun.star.security.AccessController")),
u"com.sun.star.security.AccessController"_ustr),
true));
css::uno::Reference< css::uno::XComponentContext > context(
createComponentContext(context_values.data(), context_values.size()));

20
cppuhelper/source/exc_thrower.cxx
View file

@ -115,7 +115,7 @@ void ExceptionThrower_dispatch(
default:
{
OSL_ASSERT( false );
RuntimeException exc( "not implemented!" );
RuntimeException exc( u"not implemented!"_ustr );
uno_type_any_construct(
*ppException, &exc, cppu::UnoType<decltype(exc)>::get().getTypeLibType(), nullptr );
break;
@ -227,18 +227,18 @@ void SAL_CALL throwException( Any const & exc )
if (exc.getValueTypeClass() != TypeClass_EXCEPTION)
{
throw RuntimeException(
"no UNO exception given "
"(must be derived from com::sun::star::uno::Exception)!" );
u"no UNO exception given "
"(must be derived from com::sun::star::uno::Exception)!"_ustr );
}
#if RETHROW_FAKE_EXCEPTIONS
lo_mobile_throwException(exc);
#else
Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());
Mapping uno2cpp(Environment(u"" UNO_LB_UNO ""_ustr), Environment::getCurrent());
if (! uno2cpp.is())
{
throw RuntimeException(
"cannot get binary UNO to C++ mapping!" );
u"cannot get binary UNO to C++ mapping!"_ustr );
}
Reference< XExceptionThrower > xThrower;
@ -258,17 +258,17 @@ Any SAL_CALL getCaughtException()
#if defined(ANDROID) || defined(EMSCRIPTEN)
return Any();
#else
Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO));
Mapping cpp2uno(Environment::getCurrent(), Environment(u"" UNO_LB_UNO ""_ustr));
if (! cpp2uno.is())
{
throw RuntimeException(
"cannot get C++ to binary UNO mapping!" );
u"cannot get C++ to binary UNO mapping!"_ustr );
}
Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());
Mapping uno2cpp(Environment(u"" UNO_LB_UNO ""_ustr), Environment::getCurrent());
if (! uno2cpp.is())
{
throw RuntimeException(
"cannot get binary UNO to C++ mapping!" );
u"cannot get binary UNO to C++ mapping!"_ustr );
}
typelib_TypeDescription * pTD = nullptr;
@ -296,7 +296,7 @@ Any SAL_CALL getCaughtException()
if (exc == nullptr)
{
throw RuntimeException( "rethrowing C++ exception failed!" );
throw RuntimeException( u"rethrowing C++ exception failed!"_ustr );
}
Any ret;

16
cppuhelper/source/factory.cxx
View file

@ -272,7 +272,7 @@ OFactoryComponentHelper::createInstanceWithArgumentsEveryTime(
xComp->dispose();
throw lang::IllegalArgumentException(
"cannot pass arguments to component => no XInitialization implemented!",
u"cannot pass arguments to component => no XInitialization implemented!"_ustr,
Reference< XInterface >(), 0 );
}
}
@ -459,7 +459,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
if (m_property_array_helper == nullptr)
{
beans::Property prop(
"ImplementationKey" /* name */,
u"ImplementationKey"_ustr /* name */,
0 /* handle */,
cppu::UnoType<decltype(xImplementationKey)>::get(),
beans::PropertyAttribute::READONLY |
@ -483,7 +483,7 @@ void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
sal_Int32, Any const & )
{
throw beans::PropertyVetoException(
"unexpected: only readonly properties!",
u"unexpected: only readonly properties!"_ustr,
static_cast< OWeakObject * >(this) );
}
@ -499,7 +499,7 @@ void ORegistryFactoryHelper::getFastPropertyValue(
{
rValue.clear();
throw beans::UnknownPropertyException(
"unknown property!", static_cast< OWeakObject * >(
u"unknown property!"_ustr, static_cast< OWeakObject * >(
const_cast< ORegistryFactoryHelper * >(this) ) );
}
}
@ -599,7 +599,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
OUString aLocation;
Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
"/UNO/ACTIVATOR" );
u"/UNO/ACTIVATOR"_ustr );
if( xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
{
aActivatorUrl = xActivatorKey->getAsciiValue();
@ -607,7 +607,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
aActivatorName = o3tl::getToken(aActivatorUrl, 0, ':');
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
"/UNO/LOCATION" );
u"/UNO/LOCATION"_ustr );
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
aLocation = xLocationKey->getAsciiValue();
}
@ -616,7 +616,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// old style"url"
// the location of the program code of the implementation
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
"/UNO/URL" );
u"/UNO/URL"_ustr );
// is the key of the right type ?
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
{
@ -659,7 +659,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
// not yet loaded
try
{
Reference<XRegistryKey > xKey = xImplementationKey->openKey( "UNO/SERVICES" );
Reference<XRegistryKey > xKey = xImplementationKey->openKey( u"UNO/SERVICES"_ustr );
if (xKey.is())
{

4
cppuhelper/source/paths.cxx
View file

@ -88,14 +88,14 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, OUString * url) {
return false;
default:
throw css::uno::DeploymentException(
"Cannot iterate directory");
u"Cannot iterate directory"_ustr);
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
if (i.getFileStatus(stat) != osl::FileBase::E_None) {
throw css::uno::DeploymentException(
"Cannot stat in directory");
u"Cannot stat in directory"_ustr);
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
// Ignore backup and spurious junk files:

54
cppuhelper/source/propertysetmixin.cxx
View file

@ -231,7 +231,7 @@ void Data::initProperties(
getTypeArguments());
if (args.getLength() != 1) {
throw css::uno::RuntimeException(
"inconsistent UNO type registry");
u"inconsistent UNO type registry"_ustr);
}
t = args[0];
}
@ -239,7 +239,7 @@ void Data::initProperties(
= handleNames->size();
if (handles > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
"interface type has too many attributes");
u"interface type has too many attributes"_ustr);
}
OUString name(m->getMemberName());
if (!properties.emplace(
@ -255,7 +255,7 @@ void Data::initProperties(
second)
{
throw css::uno::RuntimeException(
"inconsistent UNO type registry");
u"inconsistent UNO type registry"_ustr);
}
handleNames->push_back(name);
}
@ -425,8 +425,8 @@ PropertySetMixinImpl::Impl::Impl(
ifc.set(
css::uno::Reference< css::container::XHierarchicalNameAccess >(
m_context->getValueByName(
"/singletons/com.sun.star.reflection."
"theTypeDescriptionManager"),
u"/singletons/com.sun.star.reflection."
"theTypeDescriptionManager"_ustr),
css::uno::UNO_QUERY_THROW)->getByHierarchicalName(
m_type.getTypeName()),
css::uno::UNO_QUERY_THROW);
@ -607,17 +607,17 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
getReflection(value.getValueTypeName()));
try {
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
ambiguous->getField("IsAmbiguous"),
ambiguous->getField(u"IsAmbiguous"_ustr),
css::uno::UNO_QUERY_THROW)->get(value)
>>= isAmbiguous))
{
throw css::uno::RuntimeException(
("unexpected type of com.sun.star.beans.Ambiguous"
" IsAmbiguous member"),
(u"unexpected type of com.sun.star.beans.Ambiguous"
" IsAmbiguous member"_ustr),
object);
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
ambiguous->getField("Value"), css::uno::UNO_QUERY_THROW)->
ambiguous->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW)->
get(value);
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any anyEx = cppu::getCaughtException();
@ -636,17 +636,17 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
try {
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
defaulted->getField("IsDefaulted"),
defaulted->getField(u"IsDefaulted"_ustr),
css::uno::UNO_QUERY_THROW)->get(value)
>>= isDefaulted))
{
throw css::uno::RuntimeException(
("unexpected type of com.sun.star.beans.Defaulted"
" IsDefaulted member"),
(u"unexpected type of com.sun.star.beans.Defaulted"
" IsDefaulted member"_ustr),
object);
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
defaulted->getField("Value"), css::uno::UNO_QUERY_THROW)->
defaulted->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW)->
get(value);
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any anyEx = cppu::getCaughtException();
@ -665,13 +665,13 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
try {
bool present = false;
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
optional->getField("IsPresent"),
optional->getField(u"IsPresent"_ustr),
css::uno::UNO_QUERY_THROW)->get(value)
>>= present))
{
throw css::uno::RuntimeException(
("unexpected type of com.sun.star.beans.Optional"
" IsPresent member"),
(u"unexpected type of com.sun.star.beans.Optional"
" IsPresent member"_ustr),
object);
}
if (!present) {
@ -679,7 +679,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
break;
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
optional->getField("Value"), css::uno::UNO_QUERY_THROW)->
optional->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW)->
get(value);
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any anyEx = cppu::getCaughtException();
@ -730,14 +730,14 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
type->createObject(strct);
try {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField("Value"), css::uno::UNO_QUERY_THROW);
type->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW);
field->set(
strct,
wrapValue(
object, value, field->getType(), false, false,
wrapDefaulted, isDefaulted, wrapOptional));
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField("IsAmbiguous"), css::uno::UNO_QUERY_THROW)->set(
type->getField(u"IsAmbiguous"_ustr), css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::Any(isAmbiguous));
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any anyEx = cppu::getCaughtException();
@ -761,14 +761,14 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
type->createObject(strct);
try {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField("Value"), css::uno::UNO_QUERY_THROW);
type->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW);
field->set(
strct,
wrapValue(
object, value, field->getType(), wrapAmbiguous, isAmbiguous,
false, false, wrapOptional));
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField("IsDefaulted"), css::uno::UNO_QUERY_THROW)->set(
type->getField(u"IsDefaulted"_ustr), css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::Any(isDefaulted));
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any anyEx = cppu::getCaughtException();
@ -793,11 +793,11 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
bool present = value.hasValue();
try {
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField("IsPresent"), css::uno::UNO_QUERY_THROW)->set(
type->getField(u"IsPresent"_ustr), css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::Any(present));
if (present) {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField("Value"), css::uno::UNO_QUERY_THROW);
type->getField(u"Value"_ustr), css::uno::UNO_QUERY_THROW);
field->set(
strct,
wrapValue(
@ -821,7 +821,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
}
if (wrapAmbiguous || wrapDefaulted || wrapOptional) {
throw css::uno::RuntimeException(
"unexpected type of attribute", object);
u"unexpected type of attribute"_ustr, object);
}
return value;
}
@ -859,7 +859,7 @@ void PropertySetMixinImpl::prepareSet(
std::scoped_lock g(m_impl->mutex);
if (m_impl->disposed) {
throw css::lang::DisposedException(
"disposed", static_cast< css::beans::XPropertySet * >(this));
u"disposed"_ustr, static_cast< css::beans::XPropertySet * >(this));
}
if ((it->second.property.Attributes
& css::beans::PropertyAttribute::CONSTRAINED)
@ -870,7 +870,7 @@ void PropertySetMixinImpl::prepareSet(
if (i != m_impl->vetoListeners.end()) {
specificVeto = i->second;
}
i = m_impl->vetoListeners.find("");
i = m_impl->vetoListeners.find(u""_ustr);
if (i != m_impl->vetoListeners.end()) {
unspecificVeto = i->second;
}
@ -885,7 +885,7 @@ void PropertySetMixinImpl::prepareSet(
if (i != m_impl->boundListeners.end()) {
boundListeners->m_impl->specificListeners = i->second;
}
i = m_impl->boundListeners.find("");
i = m_impl->boundListeners.find(u""_ustr);
if (i != m_impl->boundListeners.end()) {
boundListeners->m_impl->unspecificListeners = i->second;
}

2
cppuhelper/source/propshlp.cxx
View file

@ -869,7 +869,7 @@ void OPropertySetHelper::setPropertyValues(
{
sal_Int32 nSeqLen = rPropertyNames.getLength();
if (nSeqLen != rValues.getLength())
throw IllegalArgumentException("lengths do not match", static_cast<XPropertySet*>(this),
throw IllegalArgumentException(u"lengths do not match"_ustr, static_cast<XPropertySet*>(this),
-1);
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
// get the map table

46
cppuhelper/source/servicemanager.cxx
View file

@ -484,7 +484,7 @@ css::uno::Any ContentEnumeration::nextElement()
std::scoped_lock g(mutex_);
if (iterator_ == factories_.end()) {
throw css::container::NoSuchElementException(
"Bootstrap service manager service enumerator has no more elements",
u"Bootstrap service manager service enumerator has no more elements"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
return *iterator_++;
@ -492,7 +492,7 @@ css::uno::Any ContentEnumeration::nextElement()
css::beans::Property getDefaultContextProperty() {
return css::beans::Property(
"DefaultContext", -1,
u"DefaultContext"_ustr, -1,
cppu::UnoType< css::uno::XComponentContext >::get(),
css::beans::PropertyAttribute::READONLY);
}
@ -941,7 +941,7 @@ void cppuhelper::ServiceManager::initialize(
|| arg != "preload")
{
throw css::lang::IllegalArgumentException(
"invalid ServiceManager::initialize argument",
u"invalid ServiceManager::initialize argument"_ustr,
css::uno::Reference<css::uno::XInterface>(), 0);
}
preloadImplementations();
@ -950,7 +950,7 @@ void cppuhelper::ServiceManager::initialize(
OUString cppuhelper::ServiceManager::getImplementationName()
{
return
"com.sun.star.comp.cppuhelper.bootstrap.ServiceManager";
u"com.sun.star.comp.cppuhelper.bootstrap.ServiceManager"_ustr;
}
sal_Bool cppuhelper::ServiceManager::supportsService(
@ -962,7 +962,7 @@ sal_Bool cppuhelper::ServiceManager::supportsService(
css::uno::Sequence< OUString >
cppuhelper::ServiceManager::getSupportedServiceNames()
{
return { "com.sun.star.lang.MultiServiceFactory", "com.sun.star.lang.ServiceManager" };
return { u"com.sun.star.lang.MultiServiceFactory"_ustr, u"com.sun.star.lang.ServiceManager"_ustr };
}
css::uno::Reference< css::uno::XInterface >
@ -992,7 +992,7 @@ cppuhelper::ServiceManager::getAvailableServiceNames()
}
if (data_.services.size() > o3tl::make_unsigned(SAL_MAX_INT32)) {
throw css::uno::RuntimeException(
"getAvailableServiceNames: too many services",
u"getAvailableServiceNames: too many services"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
return comphelper::mapKeysToSequence(data_.services);
@ -1038,14 +1038,14 @@ css::uno::Reference< css::container::XEnumeration >
cppuhelper::ServiceManager::createEnumeration()
{
throw css::uno::RuntimeException(
"ServiceManager createEnumeration: method not supported",
u"ServiceManager createEnumeration: method not supported"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &)
{
throw css::uno::RuntimeException(
"ServiceManager has: method not supported",
u"ServiceManager has: method not supported"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
@ -1060,19 +1060,19 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
OUString uri;
if (!(arg.Value >>= uri)) {
throw css::lang::IllegalArgumentException(
"Bad uri argument",
u"Bad uri argument"_ustr,
static_cast< cppu::OWeakObject * >(this), 0);
}
uris.push_back(uri);
} else if (arg.Name == "component-context") {
if (alienContext.is()) {
throw css::lang::IllegalArgumentException(
"Multiple component-context arguments",
u"Multiple component-context arguments"_ustr,
static_cast< cppu::OWeakObject * >(this), 0);
}
if (!(arg.Value >>= alienContext) || !alienContext.is()) {
throw css::lang::IllegalArgumentException(
"Bad component-context argument",
u"Bad component-context argument"_ustr,
static_cast< cppu::OWeakObject * >(this), 0);
}
} else {
@ -1091,7 +1091,7 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
}
throw css::lang::IllegalArgumentException(
"Bad insert element", static_cast< cppu::OWeakObject * >(this), 0);
u"Bad insert element"_ustr, static_cast< cppu::OWeakObject * >(this), 0);
}
void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
@ -1108,7 +1108,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
OUString uri;
if (!(i.Value >>= uri)) {
throw css::lang::IllegalArgumentException(
"Bad uri argument",
u"Bad uri argument"_ustr,
static_cast< cppu::OWeakObject * >(this), 0);
}
uris.push_back(uri);
@ -1120,7 +1120,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
if ((aElement >>= info) && info.is()) {
if (!removeLegacyFactory(info, true)) {
throw css::container::NoSuchElementException(
"Remove non-inserted factory object",
u"Remove non-inserted factory object"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
return;
@ -1132,7 +1132,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
return;
}
throw css::lang::IllegalArgumentException(
"Bad remove element", static_cast< cppu::OWeakObject * >(this), 0);
u"Bad remove element"_ustr, static_cast< cppu::OWeakObject * >(this), 0);
}
css::uno::Reference< css::container::XEnumeration >
@ -1415,7 +1415,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) {
static_cast< cppu::OWeakObject * >(this));
}
RegistryKeyArray impls;
switch (rootKey.openSubKeys("IMPLEMENTATIONS", impls)) {
switch (rootKey.openSubKeys(u"IMPLEMENTATIONS"_ustr, impls)) {
case RegError::NO_ERROR:
break;
case RegError::KEY_NOT_EXISTS:
@ -1432,8 +1432,8 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) {
implKey.getName().copy(RTL_CONSTASCII_LENGTH("/IMPLEMENTATIONS/")));
std::shared_ptr< Data::Implementation > impl =
std::make_shared<Data::Implementation>(
name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
readLegacyRdbString(uri, implKey, "UNO/LOCATION"), "", "", "", false,
name, readLegacyRdbString(uri, implKey, u"UNO/ACTIVATOR"_ustr),
readLegacyRdbString(uri, implKey, u"UNO/LOCATION"_ustr), "", "", "", false,
css::uno::Reference< css::uno::XComponentContext >(), uri);
if (!data_.namedImplementations.emplace(name, impl).second)
{
@ -1441,13 +1441,13 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) {
uri + ": duplicate <implementation name=\"" + name + "\">");
}
readLegacyRdbStrings(
uri, implKey, "UNO/SERVICES", &impl->services);
uri, implKey, u"UNO/SERVICES"_ustr, &impl->services);
for (const auto& rService : impl->services)
{
data_.services[rService].push_back(impl);
}
readLegacyRdbStrings(
uri, implKey, "UNO/SINGLETONS", &impl->singletons);
uri, implKey, u"UNO/SINGLETONS"_ustr, &impl->singletons);
for (const auto& rSingleton : impl->singletons)
{
data_.singletons[rSingleton].push_back(impl);
@ -1553,8 +1553,8 @@ void cppuhelper::ServiceManager::insertLegacyFactory(
f2.set(factoryInfo, css::uno::UNO_QUERY);
if (!f2.is()) {
throw css::lang::IllegalArgumentException(
("Bad XServiceInfo argument implements neither"
" XSingleComponentFactory nor XSingleServiceFactory"),
(u"Bad XServiceInfo argument implements neither"
" XSingleComponentFactory nor XSingleServiceFactory"_ustr),
static_cast< cppu::OWeakObject * >(this), 0);
}
}
@ -1599,7 +1599,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) {
if (bDuplicate)
{
throw css::lang::IllegalArgumentException(
"Insert duplicate factory object",
u"Insert duplicate factory object"_ustr,
static_cast< cppu::OWeakObject * >(this), 0);
}
//TODO: The below leaves data_ in an inconsistent state upon exceptions:

16
cppuhelper/source/shlib.cxx
View file

@ -126,7 +126,7 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
{
if (!(source.is() && target.is())) {
throw css::loader::CannotActivateFactoryException(
"cannot get environments",
u"cannot get environments"_ustr,
css::uno::Reference<css::uno::XInterface>());
}
OString impl(
@ -141,7 +141,7 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
css::uno::Mapping mapFrom(target, source);
if (!(mapTo.is() && mapFrom.is())) {
throw css::loader::CannotActivateFactoryException(
"cannot get mappings",
u"cannot get mappings"_ustr,
css::uno::Reference<css::uno::XInterface>());
}
void * smgr = mapTo.mapInterface(
@ -189,7 +189,7 @@ cppuhelper::WrapperConstructorFn mapConstructorFn(
{
if (!(source.is() && target.is())) {
throw css::loader::CannotActivateFactoryException(
"cannot get environments",
u"cannot get environments"_ustr,
css::uno::Reference<css::uno::XInterface>());
}
if (source.get() == target.get()) {
@ -202,7 +202,7 @@ cppuhelper::WrapperConstructorFn mapConstructorFn(
css::uno::Mapping mapFrom(target, source);
if (!(mapTo.is() && mapFrom.is())) {
throw css::loader::CannotActivateFactoryException(
"cannot get mappings",
u"cannot get mappings"_ustr,
css::uno::Reference<css::uno::XInterface>());
}
return [mapFrom, mapTo, target, constructorFunction]
@ -365,7 +365,7 @@ css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory(
assert(!xKey.is()); (void) xKey;
css::uno::Reference<css::uno::XInterface> fac;
cppuhelper::detail::loadSharedLibComponentFactory(
uri, "", "", rImplName, "", xMgr, nullptr, &fac);
uri, u""_ustr, u""_ustr, rImplName, u""_ustr, xMgr, nullptr, &fac);
return fac;
}
@ -403,16 +403,16 @@ void cppu::writeSharedLibComponentInfo(
css::uno::Reference<css::uno::XInterface>());
}
css::uno::Environment curEnv(css::uno::Environment::getCurrent());
css::uno::Environment env(getEnvironmentFromModule(mod, curEnv, u"", ""));
css::uno::Environment env(getEnvironmentFromModule(mod, curEnv, u"", u""_ustr));
if (!(curEnv.is() && env.is())) {
throw css::registry::CannotRegisterImplementationException(
"cannot get environments",
u"cannot get environments"_ustr,
css::uno::Reference<css::uno::XInterface>());
}
css::uno::Mapping map(curEnv, env);
if (!map.is()) {
throw css::registry::CannotRegisterImplementationException(
"cannot get mapping", css::uno::Reference<css::uno::XInterface>());
u"cannot get mapping"_ustr, css::uno::Reference<css::uno::XInterface>());
}
void * smgr = map.mapInterface(
xMgr.get(), cppu::UnoType<css::lang::XMultiServiceFactory>::get());

30
cppuhelper/source/tdmgr.cxx
View file

@ -431,91 +431,91 @@ static typelib_TypeDescription * createCTD(
// built in types
case TypeClass_VOID:
{
OUString aTypeName("void");
OUString aTypeName(u"void"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_VOID, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_CHAR:
{
OUString aTypeName("char");
OUString aTypeName(u"char"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_CHAR, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_BOOLEAN:
{
OUString aTypeName("boolean");
OUString aTypeName(u"boolean"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_BOOLEAN, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_BYTE:
{
OUString aTypeName("byte");
OUString aTypeName(u"byte"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_BYTE, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_SHORT:
{
OUString aTypeName("short");
OUString aTypeName(u"short"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_SHORT, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_UNSIGNED_SHORT:
{
OUString aTypeName("unsigned short");
OUString aTypeName(u"unsigned short"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_SHORT, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_LONG:
{
OUString aTypeName("long");
OUString aTypeName(u"long"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_LONG, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_UNSIGNED_LONG:
{
OUString aTypeName("unsigned long");
OUString aTypeName(u"unsigned long"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_LONG, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_HYPER:
{
OUString aTypeName("hyper");
OUString aTypeName(u"hyper"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_HYPER, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_UNSIGNED_HYPER:
{
OUString aTypeName("unsigned hyper");
OUString aTypeName(u"unsigned hyper"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_HYPER, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_FLOAT:
{
OUString aTypeName("float");
OUString aTypeName(u"float"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_FLOAT, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_DOUBLE:
{
OUString aTypeName("double");
OUString aTypeName(u"double"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_DOUBLE, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_STRING:
{
OUString aTypeName("string");
OUString aTypeName(u"string"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_STRING, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_TYPE:
{
OUString aTypeName("type");
OUString aTypeName(u"type"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_TYPE, aTypeName.pData, nullptr, 0, nullptr );
break;
}
case TypeClass_ANY:
{
OUString aTypeName("any");
OUString aTypeName(u"any"_ustr);
typelib_typedescription_new( &pRet, typelib_TypeClass_ANY, aTypeName.pData, nullptr, 0, nullptr );
break;
}

20
cppuhelper/source/typemanager.cxx
View file

@ -1711,7 +1711,7 @@ Enumeration::nextTypeDescription()
std::scoped_lock g(mutex_);
if (positions_.empty()) {
throw css::container::NoSuchElementException(
"exhausted XTypeDescriptionEnumeration",
u"exhausted XTypeDescriptionEnumeration"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
name = current_;
@ -1905,7 +1905,7 @@ cppuhelper::TypeManager::~TypeManager() noexcept {}
OUString cppuhelper::TypeManager::getImplementationName()
{
return
"com.sun.star.comp.cppuhelper.bootstrap.TypeManager";
u"com.sun.star.comp.cppuhelper.bootstrap.TypeManager"_ustr;
}
sal_Bool cppuhelper::TypeManager::supportsService(
@ -1917,7 +1917,7 @@ sal_Bool cppuhelper::TypeManager::supportsService(
css::uno::Sequence< OUString >
cppuhelper::TypeManager::getSupportedServiceNames()
{
return { "com.sun.star.reflection.TypeDescriptionManager" }; //TODO
return { u"com.sun.star.reflection.TypeDescriptionManager"_ustr }; //TODO
}
css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
@ -1945,7 +1945,7 @@ css::uno::Type cppuhelper::TypeManager::getElementType()
sal_Bool cppuhelper::TypeManager::hasElements()
{
throw css::uno::RuntimeException(
"TypeManager hasElements: method not supported",
u"TypeManager hasElements: method not supported"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
@ -1953,14 +1953,14 @@ css::uno::Reference< css::container::XEnumeration >
cppuhelper::TypeManager::createEnumeration()
{
throw css::uno::RuntimeException(
"TypeManager createEnumeration: method not supported",
u"TypeManager createEnumeration: method not supported"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
{
throw css::uno::RuntimeException(
"TypeManager has: method not supported",
u"TypeManager has: method not supported"_ustr,
static_cast< cppu::OWeakObject * >(this));
}
@ -1969,8 +1969,8 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
OUString uri;
if (!(aElement >>= uri)) {
throw css::lang::IllegalArgumentException(
("css.uno.theTypeDescriptionManager.insert expects a string URI"
" argument"),
(u"css.uno.theTypeDescriptionManager.insert expects a string URI"
" argument"_ustr),
static_cast< cppu::OWeakObject * >(this), 0);
}
//TODO: check for ElementExistException
@ -1983,8 +1983,8 @@ void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
OUString uri;
if (!(aElement >>= uri)) {
throw css::lang::IllegalArgumentException(
("css.uno.theTypeDescriptionManager.remove expects a string URI"
" argument"),
(u"css.uno.theTypeDescriptionManager.remove expects a string URI"
" argument"_ustr),
static_cast< cppu::OWeakObject * >(this), 0);
}
//TODO: remove requests are silently ignored for now

20
cppuhelper/source/unourl.cxx
View file

@ -68,7 +68,7 @@ inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor)
case STATE_NAME0:
if (bEnd || !rtl::isAsciiAlphanumeric(c))
throw rtl::MalformedUriException(
"UNO URL contains bad descriptor name");
u"UNO URL contains bad descriptor name"_ustr);
nStart = i;
eState = STATE_NAME;
break;
@ -82,13 +82,13 @@ inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor)
}
else if (!rtl::isAsciiAlphanumeric(c))
throw rtl::MalformedUriException(
"UNO URL contains bad descriptor name");
u"UNO URL contains bad descriptor name"_ustr);
break;
case STATE_KEY0:
if (bEnd || !rtl::isAsciiAlphanumeric(c))
throw rtl::MalformedUriException(
"UNO URL contains bad parameter key");
u"UNO URL contains bad parameter key"_ustr);
nStart = i;
eState = STATE_KEY;
break;
@ -102,7 +102,7 @@ inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor)
}
else if (bEnd || !rtl::isAsciiAlphanumeric(c))
throw rtl::MalformedUriException(
"UNO URL contains bad parameter key");
u"UNO URL contains bad parameter key"_ustr);
break;
case STATE_VALUE:
@ -115,7 +115,7 @@ inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor)
rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8)).second)
throw rtl::MalformedUriException(
"UNO URL contains duplicated parameter");
u"UNO URL contains duplicated parameter"_ustr);
eState = STATE_KEY0;
}
break;
@ -198,20 +198,20 @@ private:
inline UnoUrl::Impl * UnoUrl::Impl::create(OUString const & rUrl)
{
if (!rUrl.startsWithIgnoreAsciiCase("uno:"))
throw rtl::MalformedUriException("UNO URL does not start with \"uno:\"");
throw rtl::MalformedUriException(u"UNO URL does not start with \"uno:\""_ustr);
sal_Int32 i = RTL_CONSTASCII_LENGTH("uno:");
sal_Int32 j = rUrl.indexOf(';', i);
if (j < 0)
throw rtl::MalformedUriException("UNO URL has too few semicolons");
throw rtl::MalformedUriException(u"UNO URL has too few semicolons"_ustr);
OUString aConnection(rUrl.copy(i, j - i));
i = j + 1;
j = rUrl.indexOf(0x3B, i); // ';'
if (j < 0)
throw rtl::MalformedUriException("UNO URL has too few semicolons");
throw rtl::MalformedUriException(u"UNO URL has too few semicolons"_ustr);
OUString aProtocol(rUrl.copy(i, j - i));
i = j + 1;
if (i == rUrl.getLength())
throw rtl::MalformedUriException("UNO URL contains empty ObjectName");
throw rtl::MalformedUriException(u"UNO URL contains empty ObjectName"_ustr);
for (j = i; j < rUrl.getLength(); ++j)
{
sal_Unicode c = rUrl[j];
@ -222,7 +222,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(OUString const & rUrl)
&& c != 0x2F && c != 0x3A && c != 0x3D // '/', ':', '='
&& c != 0x3F && c != 0x40 && c != 0x5F // '?', '@', '_'
&& c != 0x7E) // '~'
throw rtl::MalformedUriException("UNO URL contains invalid ObjectName");
throw rtl::MalformedUriException(u"UNO URL contains invalid ObjectName"_ustr);
}
return new Impl(aConnection, aProtocol, rUrl.copy(i));
}