diff options
Diffstat (limited to 'unodevtools/source/skeletonmaker/cpptypemaker.cxx')
| -rw-r--r-- | unodevtools/source/skeletonmaker/cpptypemaker.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 92a2db00c4b5..1e9d459f0551 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -168,7 +168,7 @@ static bool printConstructorParameters( printType(o, options, manager, rMember.type, 4); o << ' ' << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rMember.name), "param"); + rMember.name.toUtf8(), "param"); } break; } @@ -191,7 +191,7 @@ static bool printConstructorParameters( } o << ' ' << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rMember.name), "param"); + rMember.name.toUtf8(), "param"); } break; } @@ -218,7 +218,7 @@ static bool printConstructorParameters( } o << ' ' << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rMember.name), "param"); + rMember.name.toUtf8(), "param"); } break; } @@ -244,7 +244,7 @@ static bool printConstructorParameters( printType(o, options, manager, rMember.type, 4); o << ' ' << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rMember.name), "param"); + rMember.name.toUtf8(), "param"); } break; } @@ -295,7 +295,7 @@ static void printMethodParameters( printType(o, options, manager, i->type, referenceType); o << ' '; } - o << codemaker::cpp::translateUnoToCppIdentifier(u2b(i->name), "param"); + o << codemaker::cpp::translateUnoToCppIdentifier(i->name.toUtf8(), "param"); } } @@ -405,7 +405,7 @@ void printMethods(std::ostream & o, OString const & indentation, bool defaultvalue, OUString const & propertyhelper) { - if (generated.contains(u2b(name)) || name == "com.sun.star.uno.XInterface" || + if (generated.contains(name.toUtf8()) || name == "com.sun.star.uno.XInterface" || (defaultvalue && ( name == "com.sun.star.lang.XComponent" || name == "com.sun.star.lang.XTypeProvider" || @@ -420,19 +420,19 @@ void printMethods(std::ostream & o, if (body && propertyhelper.getLength() > 1) { if (name == "com.sun.star.beans.XPropertySet") { - generated.add(u2b(name)); + generated.add(name.toUtf8()); generateXPropertySetBodies( - o, classname, scopedCppName(u2b(propertyhelper))); + o, classname, scopedCppName(propertyhelper.toUtf8())); return; } else if (name == "com.sun.star.beans.XFastPropertySet") { - generated.add(u2b(name)); + generated.add(name.toUtf8()); generateXFastPropertySetBodies( - o, classname, scopedCppName(u2b(propertyhelper))); + o, classname, scopedCppName(propertyhelper.toUtf8())); return; } else if (name == "com.sun.star.beans.XPropertyAccess") { - generated.add(u2b(name)); + generated.add(name.toUtf8()); generateXPropertyAccessBodies( - o, classname, scopedCppName(u2b(propertyhelper))); + o, classname, scopedCppName(propertyhelper.toUtf8())); return; } } @@ -444,11 +444,11 @@ void printMethods(std::ostream & o, "throw (css::uno::RuntimeException)\n{\n " "return OUString(" "sADDIN_SERVICENAME);\n}\n"; - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } else if (name == "com.sun.star.sheet.XAddIn") { generateXAddInBodies(o, classname); - generated.add(u2b(name)); + generated.add(name.toUtf8()); // special handling of XLocalizable -> parent of XAddIn if (!generated.contains("com.sun.star.lang.XLocalizable")) { @@ -458,11 +458,11 @@ void printMethods(std::ostream & o, return; } else if (name == "com.sun.star.lang.XLocalizable") { generateXLocalizable(o, classname); - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } else if (name == "com.sun.star.sheet.XCompatibilityNames") { generateXCompatibilityNamesBodies(o, classname); - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } } @@ -470,20 +470,20 @@ void printMethods(std::ostream & o, if (body && options.componenttype == 3) { if (name == "com.sun.star.lang.XInitialization") { generateXInitialization(o, classname); - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } else if (name == "com.sun.star.frame.XDispatch") { generateXDispatch(o, classname, options.protocolCmdMap); - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } else if (name == "com.sun.star.frame.XDispatchProvider") { generateXDispatchProvider(o, classname, options.protocolCmdMap); - generated.add(u2b(name)); + generated.add(name.toUtf8()); return; } } - generated.add(u2b(name)); + generated.add(name.toUtf8()); rtl::Reference< unoidl::Entity > ent; if (manager->getSort(name, &ent) != codemaker::UnoType::Sort::Interface) { @@ -657,7 +657,7 @@ static void printConstructors( o << "create"; } else { o << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rConstructor.name), "method"); + rConstructor.name.toUtf8(), "method"); } o << ((options.shortnames) ? "(css::uno::Reference< css" : "(::com::sun::star::uno::Reference< ::com::sun::star") @@ -668,7 +668,7 @@ static void printConstructors( printType(o, options, manager, rParam.type, 4); o << ' ' << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rParam.name), "param"); + rParam.name.toUtf8(), "param"); } o << ')'; printExceptionSpecification(o, options, manager, rConstructor.exceptions); @@ -687,13 +687,13 @@ static void printServiceMembers( for (const auto& rService : entity->getDirectMandatoryBaseServices()) { o << "\n// exported service " << rService.name << "\n"; - generateDocumentation(o, options, manager, u2b(rService.name), delegate); + generateDocumentation(o, options, manager, rService.name.toUtf8(), delegate); o << "\n// end of exported service " << rService.name << "\n"; } for (const auto& rIface : entity->getDirectMandatoryBaseInterfaces()) { o << "\n// supported interface " << rIface.name << "\n"; - generateDocumentation(o, options, manager, u2b(rIface.name), delegate); + generateDocumentation(o, options, manager, rIface.name.toUtf8(), delegate); } if (delegate.isEmpty()) { o << "\n// properties of service \""<< name << "\"\n"; @@ -703,7 +703,7 @@ static void printServiceMembers( printType(o, options, manager, rProp.type, 1); o << " " << codemaker::cpp::translateUnoToCppIdentifier( - u2b(rProp.name), "property") + rProp.name.toUtf8(), "property") << ";\n"; } } @@ -738,7 +738,7 @@ void generateDocumentation(std::ostream & o, OUString nucleus; sal_Int32 rank; codemaker::UnoType::Sort sort = manager->decompose( - b2u(type), false, &nucleus, &rank, nullptr, nullptr); + OUString::fromUtf8(type), false, &nucleus, &rank, nullptr, nullptr); bool comment = true; if (!delegate.isEmpty()) { @@ -821,7 +821,7 @@ void generateDocumentation(std::ostream & o, std::vector< OUString > arguments; rtl::Reference< unoidl::Entity > entity; sort = manager->decompose( - b2u(type), true, &nucleus, &rank, &arguments, &entity); + OUString::fromUtf8(type), true, &nucleus, &rank, &arguments, &entity); if (rank != 0) { if (comment) { printMapsToCppType( @@ -930,8 +930,8 @@ void generateDocumentation(std::ostream & o, assert(dynamic_cast<unoidl::SingleInterfaceBasedServiceEntity*>(entity.get())); generateDocumentation( o, options, manager, - u2b(static_cast<unoidl::SingleInterfaceBasedServiceEntity*>( - entity.get())->getBase()), + static_cast<unoidl::SingleInterfaceBasedServiceEntity*>( + entity.get())->getBase().toUtf8(), delegate); break; |