[Libreoffice-commits] core.git: sal/osl

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 27 14:19:34 UTC 2021


 sal/osl/w32/module.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fc87a30e64f28d5f7f19a4220910681e918244e3
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Aug 27 14:55:31 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Aug 27 16:19:00 2021 +0200

    Fix this FIXME
    
    Change-Id: I4449d3c87adbcb94c721799aa6de1d615eb7041f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121070
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index ab50450daf7d..798da4183e7c 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -107,9 +107,9 @@ oslModule SAL_CALL osl_loadModuleAscii(const char *pModuleName, sal_Int32 )
 }
 
 oslModule osl_loadModuleRelativeAscii(
-    oslGenericFunction, char const * relativePath, sal_Int32 mode)
+    oslGenericFunction baseModule, char const * relativePath, sal_Int32 mode)
 {
-    return osl_loadModuleAscii(relativePath, mode); //TODO: FIXME
+    return osl_loadModuleRelative(baseModule, OUString::createFromAscii(relativePath).pData, mode);
 }
 
 sal_Bool SAL_CALL


More information about the Libreoffice-commits mailing list