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

[Stephan Bergmann (via logerrit)]

 avmedia/source/vlc/wrapper/SymbolLoader.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aebfaf13f20e6a106a024b38a671474debd5346a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Sep 6 21:55:18 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 7 10:22:49 2020 +0200

    Use plain char osl_getAsciiFunctionSymbol
    
    Change-Id: I932675efaeb1072602775115fc368bbba7bfd2b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102134
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 5bbdf18580a8..3c67b82f15c3 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -19,7 +19,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
-#define SYM_MAP(a) { u ## #a, reinterpret_cast<SymbolFunc *>(&a) }
+#define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
 
 namespace avmedia::vlc::wrapper
 {
@@ -27,7 +27,7 @@ typedef void (*SymbolFunc) (void);
 
 struct ApiMap
 {
-    OUStringLiteral symName;
+    char const * symName;
     SymbolFunc *refValue;
 };
 
@@ -70,8 +70,8 @@ struct ApiMap
     {
         for (size_t i = 0; i < N; ++i)
         {
-            SymbolFunc aMethod = reinterpret_cast<SymbolFunc>(osl_getFunctionSymbol
-                ( aModule, OUString( pMap[ i ].symName ).pData ));
+            SymbolFunc aMethod = reinterpret_cast<SymbolFunc>(osl_getAsciiFunctionSymbol
+                ( aModule, pMap[ i ].symName ));
             if ( !aMethod )
             {
                 SAL_WARN("avmedia", "Cannot load method " << pMap[ i ].symName);