diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index f45f5b50da0b..53983aa27370 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -24,12 +24,13 @@ #include #ifdef _WIN32 -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" +constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME = u"com.sun.star.comp.avmedia.Manager_DirectX"_ustr; #else #ifdef MACOSX -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF" +constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME = u"com.sun.star.comp.avmedia.Manager_MacAVF"_ustr; #else -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" +constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME + = u"com.sun.star.comp.avmedia.Manager_GStreamer"_ustr; #endif #endif diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 823152e3b029..71d449b75748 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -192,7 +192,7 @@ uno::Reference MediaWindowImpl::createPlayer(const OUString& rUR else if (sToolkitName.startsWith(u"kf6") || sToolkitName.startsWith(u"qt6")) xPlayer = createPlayer(rURL, u"com.sun.star.comp.avmedia.Manager_Qt"_ustr, xContext); else - xPlayer = createPlayer(rURL, u"" AVMEDIA_MANAGER_SERVICE_NAME ""_ustr, xContext); + xPlayer = createPlayer(rURL, AVMEDIA_MANAGER_SERVICE_NAME, xContext); } return xPlayer;