Some renaming of generated identifiers
uno_Type_com$sun$star$... and uno_Reference_com$sun$star$... Change-Id: Ibc19f423a60c521c376172807b4d5a34cf0179a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162696 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
parent
32ef7cea77
commit
2df1dcc324
@ -455,8 +455,8 @@ void writeJsMap(std::ostream& out, Module const& module, std::string const& pref
|
|||||||
{
|
{
|
||||||
out << ",\n";
|
out << ",\n";
|
||||||
}
|
}
|
||||||
out << prefix << "'" << ifc.copy(ifc.lastIndexOf('.') + 1) << "': instance." << jsName(ifc)
|
out << prefix << "'" << ifc.copy(ifc.lastIndexOf('.') + 1) << "': instance.uno_Reference_"
|
||||||
<< "Ref";
|
<< jsName(ifc);
|
||||||
comma = true;
|
comma = true;
|
||||||
}
|
}
|
||||||
for (auto const & [ id, sub ] : module.modules)
|
for (auto const & [ id, sub ] : module.modules)
|
||||||
@ -544,30 +544,31 @@ SAL_IMPLEMENT_MAIN()
|
|||||||
cppOut << "static void __attribute__((noinline)) register" << n
|
cppOut << "static void __attribute__((noinline)) register" << n
|
||||||
<< "() {\n"
|
<< "() {\n"
|
||||||
" ::emscripten::class_<"
|
" ::emscripten::class_<"
|
||||||
<< cppName(ifc) << ">(\"" << jsName(ifc) << "\")\n";
|
<< cppName(ifc) << ">(\"uno_Type_" << jsName(ifc) << "\")\n";
|
||||||
dumpAttributes(cppOut, ifc, ifcEnt);
|
dumpAttributes(cppOut, ifc, ifcEnt);
|
||||||
dumpMethods(cppOut, mgr, ifc, ifcEnt, false);
|
dumpMethods(cppOut, mgr, ifc, ifcEnt, false);
|
||||||
cppOut << " ;\n"
|
cppOut
|
||||||
" ::emscripten::class_<::com::sun::star::uno::Reference<"
|
<< " ;\n"
|
||||||
<< cppName(ifc)
|
" ::emscripten::class_<::com::sun::star::uno::Reference<"
|
||||||
<< ">, ::emscripten::base<::com::sun::star::uno::BaseReference>>(\""
|
<< cppName(ifc)
|
||||||
<< jsName(ifc)
|
<< ">, ::emscripten::base<::com::sun::star::uno::BaseReference>>(\"uno_Reference_"
|
||||||
<< "Ref\")\n"
|
<< jsName(ifc)
|
||||||
" .constructor<>()\n"
|
<< "\")\n"
|
||||||
" .constructor<::com::sun::star::uno::BaseReference, "
|
" .constructor<>()\n"
|
||||||
"::com::sun::star::uno::UnoReference_Query>()\n"
|
" .constructor<::com::sun::star::uno::BaseReference, "
|
||||||
" .function(\"is\", &::com::sun::star::uno::Reference<"
|
"::com::sun::star::uno::UnoReference_Query>()\n"
|
||||||
<< cppName(ifc)
|
" .function(\"is\", &::com::sun::star::uno::Reference<"
|
||||||
<< ">::is)\n"
|
<< cppName(ifc)
|
||||||
" .function(\"get\", &::com::sun::star::uno::Reference<"
|
<< ">::is)\n"
|
||||||
<< cppName(ifc)
|
" .function(\"get\", &::com::sun::star::uno::Reference<"
|
||||||
<< ">::get, ::emscripten::allow_raw_pointers())\n"
|
<< cppName(ifc)
|
||||||
" .function(\"set\", "
|
<< ">::get, ::emscripten::allow_raw_pointers())\n"
|
||||||
"::emscripten::select_overload<bool(::com::sun::star::uno::Any const "
|
" .function(\"set\", "
|
||||||
"&, "
|
"::emscripten::select_overload<bool(::com::sun::star::uno::Any const "
|
||||||
"com::sun::star::uno::UnoReference_Query)>(&::com::sun::star::uno::"
|
"&, "
|
||||||
"Reference<"
|
"com::sun::star::uno::UnoReference_Query)>(&::com::sun::star::uno::"
|
||||||
<< cppName(ifc) << ">::set))\n";
|
"Reference<"
|
||||||
|
<< cppName(ifc) << ">::set))\n";
|
||||||
dumpAttributes(cppOut, ifc, ifcEnt);
|
dumpAttributes(cppOut, ifc, ifcEnt);
|
||||||
dumpMethods(cppOut, mgr, ifc, ifcEnt, true);
|
dumpMethods(cppOut, mgr, ifc, ifcEnt, true);
|
||||||
cppOut << " ;\n"
|
cppOut << " ;\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user