include/static/unoembindhelpers/PrimaryBindings.hxx | 5 -----
static/README.wasm.md | 2 +-
static/source/embindmaker/embindmaker.cxx | 5 -----
static/source/unoembindhelpers/PrimaryBindings.cxx | 2 --
4 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 830ec75f2f172847d350a0801823cf87e004b33c
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Apr 18 13:21:56 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Apr 18 17:13:28 2024 +0200
Embind: We no longer need interface FromAny ctor
...now that we have uno_Any get() since
8428368d79118f1d0e09615c5d2b92065b8838d4
"Improve Embing'ing of UNO Any somewhat"
Change-Id: I06572e1ca152117c5c93a1552e50b1399af84780
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166244
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/include/static/unoembindhelpers/PrimaryBindings.hxx
b/include/static/unoembindhelpers/PrimaryBindings.hxx
index 259c9c2944f8..6acf2803132a 100644
--- a/include/static/unoembindhelpers/PrimaryBindings.hxx
+++ b/include/static/unoembindhelpers/PrimaryBindings.hxx
@@ -41,11 +41,6 @@ namespace detail
void registerUnoType(css::uno::Type const& type, std::type_info const* id);
}
-enum class uno_Reference
-{
- FromAny
-};
-
enum class uno_Sequence
{
FromSize
diff --git a/static/README.wasm.md b/static/README.wasm.md
index 69176bb8acbc..19da4518030c 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -246,7 +246,7 @@ xEnumAccess = new css.container.XEnumerationAccess(xText);
xParaEnumeration = xEnumAccess.createEnumeration();
while (xParaEnumeration.hasMoreElements()) {
- xParagraph = new css.text.XTextRange(xParaEnumeration.nextElement(),
Module.uno_Reference.FromAny);
+ xParagraph = new css.text.XTextRange(xParaEnumeration.nextElement().get());
if (xParagraph.$is()) {
xParaProps = new css.beans.XPropertySet(xParagraph);
let color = new Module.uno_Any(
diff --git a/static/source/embindmaker/embindmaker.cxx
b/static/source/embindmaker/embindmaker.cxx
index 6d89f5a5ab10..ea7879ecceb0 100644
--- a/static/source/embindmaker/embindmaker.cxx
+++ b/static/source/embindmaker/embindmaker.cxx
@@ -1087,11 +1087,6 @@ SAL_IMPLEMENT_MAIN()
".constructor(+[](::com::sun::star::uno::Reference<::com::sun::star::uno::"
"XInterface> const & the_object) { return
::com::sun::star::uno::Reference<"
<< cppName(ifc)
- << ">(the_object, ::com::sun::star::uno::UNO_QUERY); })
"
- " .constructor(+[](::com::sun::star::uno::Any
const & the_object, "
- "[[maybe_unused]] ::unoembindhelpers::uno_Reference) {
return "
- "::com::sun::star::uno::Reference<"
- << cppName(ifc)
<< ">(the_object, ::com::sun::star::uno::UNO_QUERY); })
"
" .function(\"$is\",
+[](::com::sun::star::uno::Reference<"
<< cppName(ifc)
diff --git a/static/source/unoembindhelpers/PrimaryBindings.cxx
b/static/source/unoembindhelpers/PrimaryBindings.cxx
index d74b63ab8402..fee0c3e214d1 100644
--- a/static/source/unoembindhelpers/PrimaryBindings.cxx
+++ b/static/source/unoembindhelpers/PrimaryBindings.cxx
@@ -200,8 +200,6 @@ void registerUnoType(css::uno::Type const& type,
std::type_info const* id) { uno
EMSCRIPTEN_BINDINGS(PrimaryBindings)
{
- enum_<unoembindhelpers::uno_Reference>("uno_Reference")
- .value("FromAny", unoembindhelpers::uno_Reference::FromAny);
enum_<unoembindhelpers::uno_Sequence>("uno_Sequence")
.value("FromSize", unoembindhelpers::uno_Sequence::FromSize);
