diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:19:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:19:31 +0000 |
| commit | e2341f99f9baa539c0d37c720044cd4bb812eb89 (patch) | |
| tree | 5f5088343dff74e3f618d59fd64c5878430322a1 /comphelper | |
| parent | 37cad172010ee41304a0c4ed99186590eaec2661 (diff) | |
CWS-TOOLING: integrate CWS fix30autorecovery_DEV300
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 3016490ac57a..c033b664de86 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -524,18 +524,15 @@ sal_Bool MediaDescriptor::addInputStream_Impl( sal_Bool bLockFile ) return impl_openStreamWithPostData( xPostData ); } - // b) is there a reference to a file which is just being salvaged? - ::rtl::OUString sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString()); - // c) finally, the last resort is the URL property - if ( !sFileURL.getLength() ) - sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString()); - if (!sFileURL.getLength()) + // b) ... or we must get it from the given URL + ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString()); + if (!sURL.getLength()) throw css::uno::Exception( ::rtl::OUString::createFromAscii("Found no URL."), css::uno::Reference< css::uno::XInterface >()); // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble - ::rtl::OUString sNormalizedURL = impl_normalizeURL( sFileURL ); + ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL ); return impl_openStreamWithURL( sNormalizedURL, bLockFile ); } #if OSL_DEBUG_LEVEL>0 |