[Libreoffice-commits] core.git: basic/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Sun Dec 20 19:47:15 UTC 2020


 basic/source/runtime/dllmgr-x64.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21cd30ddaa4591e058848c19920c7845582f35eb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Dec 20 18:19:57 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Dec 20 20:46:28 2020 +0100

    Blind fix for Windows x86-64 build
    
    ...after 46c5de832868d2812448b2caace3eeaa9237b9f6 "make *String(string_view)
    constructors explicit"
    
    Change-Id: I6a1d54e8dbcd98027122d33e6b6544ce00b09624
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108052
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 9e6d6838fe6a..8b6b4b4c3811 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -770,7 +770,7 @@ ErrCode SbiDllMgr::Call(
     if (cdeclConvention) {
         return ERRCODE_BASIC_NOT_IMPLEMENTED;
     }
-    OUString dllName(fullDllName(library));
+    OUString dllName(fullDllName(OUString(library)));
     Dll * dll = impl_->getDll(dllName);
     if (dll == nullptr) {
         return ERRCODE_BASIC_BAD_DLL_LOAD;


More information about the Libreoffice-commits mailing list