ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Directly go via std::u16string

Browse Source 
Change-Id: I99d3322afc7876c37a7ace016c1c6af691f28406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164591
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann
2024-03-08 22:44:50 +01:00
parent 747cfc7a02
commit ad7963f939
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/source/unoembindhelpers/PrimaryBindings.cxx
+2 -17
View File
@@ -18,9 +18,6 @@
#include <comphelper/processfactory.hxx>
#include <o3tl/any.hxx>
#include <o3tl/unreachable.hxx>
#include <rtl/string.hxx>
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <sfx2/viewsh.hxx>
@@ -142,18 +139,6 @@ EM_JS(void, jsRegisterString, (std::type_info const* raw),
namespace
{
OString toUtf8(OUString const& string)
{
OString s;
if (!string.convertToString(&s, RTL_TEXTENCODING_UTF8,
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))
{
throw css::uno::RuntimeException("cannot convert OUString to UTF-8");
}
return s;
}
void copyStruct(typelib_CompoundTypeDescription* desc, void const* source, void* dest)
{
if (desc->pBaseTypeDescription != nullptr)
@@ -258,8 +243,8 @@ EMSCRIPTEN_BINDINGS(PrimaryBindings)
return css::uno::Type(css::uno::TypeClass_INTERFACE, OUString(name));
})
.function("toString", +[](css::uno::Type const& self) {
auto const name = toUtf8(self.getTypeName());
return std::string(name.getStr(), name.getLength());
auto const name = self.getTypeName();
return std::u16string(name.getStr(), name.getLength());
});
// Any