comphelper/source/misc/mediadescriptor.cxx | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
New commits:
commit 940dba6b0f13df4c7a42265cf52fec6ba6055c5a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 14 11:35:23 2013 +0200
Some clean up
Change-Id: Ie8f8b4fe48a94cd760fa85cc83121c4ab0f3b507
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 586f6fc..f3bc92f 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
