diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-14 11:35:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-14 11:35:23 +0200 |
| commit | 940dba6b0f13df4c7a42265cf52fec6ba6055c5a (patch) | |
| tree | 643d02f05106c595767f735d39445a3d314e8a9f /comphelper | |
| parent | 4d8bf09305fc4e4bd652187aac0a02398413ba65 (diff) | |
Some clean up
Change-Id: Ie8f8b4fe48a94cd760fa85cc83121c4ab0f3b507
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 586f6fcb1675..f3bc92f9e174 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -45,9 +45,6 @@ #include <ucbhelper/activedatasink.hxx> #include <comphelper/processfactory.hxx> -#include <rtl/ustrbuf.hxx> - - namespace comphelper{ const OUString& MediaDescriptor::PROP_ABORTED() @@ -473,20 +470,12 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) OUString sNormalizedURL = impl_normalizeURL( sURL ); return impl_openStreamWithURL( sNormalizedURL, bLockFile ); } -#if OSL_DEBUG_LEVEL > 0 catch(const css::uno::Exception& ex) { - OUStringBuffer sMsg(256); - sMsg.appendAscii("Invalid MediaDescriptor detected:\n"); - sMsg.append (ex.Message ); - OSL_FAIL(OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN( + "comphelper", "invalid MediaDescriptor detected: " << ex.Message); + return false; } -#else - catch(const css::uno::Exception&) - {} -#endif - - return sal_False; } sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData ) |