diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:45:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:50:58 +0100 |
| commit | 0c7bff02710f8ad7915e215f723b6abad0079221 (patch) | |
| tree | 30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /avmedia | |
| parent | f4573ceb2965ccc8abc1f5165b0fa63f5d63649f (diff) | |
Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.
A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 97f36cef5b91..c6b46aff133d 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -31,7 +31,7 @@ #include "mediamisc.hxx" #include "mediawindow.hrc" #include <rtl/oustringostreaminserter.hxx> -#include <sal/log.h> +#include <sal/log.hxx> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -83,14 +83,14 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: xManager->createPlayer( rURL ), uno::UNO_QUERY ); } else - SAL_WARN_S( + SAL_WARN( "avmedia", ("failed to create media player service " AVMEDIA_MANAGER_SERVICE_NAME)); } catch( const uno::Exception &e ) { - SAL_WARN_S( + SAL_WARN( "avmedia", "couldn't create media player " AVMEDIA_MANAGER_SERVICE_NAME ", exception '" << e.Message << '\''); |