diff options
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcframegrabber.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcwindow.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 466e3a70cb0a..d030271b1c7f 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -184,8 +184,8 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR static OUStringLiteral aServiceManagers[] = { - AVMEDIA_MANAGER_SERVICE_PREFERRED, - AVMEDIA_MANAGER_SERVICE_NAME, + u"" AVMEDIA_MANAGER_SERVICE_PREFERRED, + u"" AVMEDIA_MANAGER_SERVICE_NAME, }; for (const auto& rServiceName : aServiceManagers) diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 34dfe00eb53e..359e2c409f79 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -42,8 +42,8 @@ namespace avmedia::vlc { namespace { - const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC"; - const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC"; + const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.VLCFrameGrabber_VLC"; + const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = u"com.sun.star.media.VLCFrameGrabber_VLC"; const int MSEC_IN_SEC = 1000; const char * const VLC_ARGS[] = { diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index c68b6ddd43fb..4880b1869b7c 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -32,8 +32,8 @@ namespace avmedia::vlc { namespace { - const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC"; - const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC"; + const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Player_VLC"; + const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = u"com.sun.star.media.Player_VLC"; const int MS_IN_SEC = 1000; // Millisec in sec } diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index b12239c55519..29c8b239899a 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -28,8 +28,8 @@ namespace avmedia::vlc { namespace { - const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC"; - const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC"; + const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Window_VLC"; + const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = u"com.sun.star.media.Window_VLC"; } VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID ) diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 7633c5956972..5bbdf18580a8 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) { #a, reinterpret_cast<SymbolFunc *>(&a) } +#define SYM_MAP(a) { u ## #a, reinterpret_cast<SymbolFunc *>(&a) } namespace avmedia::vlc::wrapper { |