diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:34:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:41:47 +0100 |
| commit | 70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 (patch) | |
| tree | ffb31ef817b5f2037cf7c332da422b9179d613d5 /avmedia/source | |
| parent | f2972242673cc9608960e9ca70e82766be5275e3 (diff) | |
New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
addressed.
* Some replacements tools String -> rtl::OUString.
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 77ec02b5846c..3c883a18d872 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -30,6 +30,8 @@ #include <avmedia/mediaitem.hxx> #include "mediamisc.hxx" #include "mediawindow.hrc" +#include <rtl/oustringostreaminserter.hxx> +#include <sal/log.h> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -81,14 +83,18 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: xManager->createPlayer( rURL ), uno::UNO_QUERY ); } else - OSL_FAIL( "failed to create media player service " AVMEDIA_MANAGER_SERVICE_NAME ); + SAL_WARN_S( + "avmedia", + ("failed to create media player service " + AVMEDIA_MANAGER_SERVICE_NAME)); } catch( const uno::Exception &e ) { (void)e; - OSL_FAIL( OSL_FORMAT( "couldn't create media player '%s', exception '%s'", - AVMEDIA_MANAGER_SERVICE_NAME, - rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ) ); + SAL_WARN_S( + "avmedia", + "couldn't create media player " AVMEDIA_MANAGER_SERVICE_NAME + ", exception '" << e.Message << '\''); } } |