diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 14:35:03 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 14:35:03 +0100 |
| commit | 285a22c6702e0bc9b9c8c72d5fda02dba1826c2c (patch) | |
| tree | e1c39b57471da7746bd7166fadd113de84deff7b /desktop/source/deployment/registry/package | |
| parent | 71a459f4be01dd776d779beea60725fbec9c7751 (diff) | |
| parent | 60d64eb4b99074523065fe54baee60a168380b3f (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
avmedia/source/gstreamer/gstplayer.cxx
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
sfx2/source/appl/appserv.cxx
Diffstat (limited to 'desktop/source/deployment/registry/package')
| -rwxr-xr-x[-rw-r--r--] | desktop/source/deployment/registry/package/dp_package.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 6e58e5c6b802..dba70f598857 100644..100755 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -985,16 +985,20 @@ OUString BackendImpl::PackageImpl::getDescription() if (sRelativeURL.getLength()) { OUString sURL = m_url_expanded + OUSTR("/") + sRelativeURL; - sDescription = getTextFromURL( - css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL); + try + { + sDescription = getTextFromURL( css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL ); + } + catch ( css::deployment::DeploymentException& ) + { + OSL_ENSURE( 0, ::rtl::OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); + } } + if (sDescription.getLength()) return sDescription; - else if(m_oldDescription.getLength()) - return m_oldDescription; - else - return OUString(); + return m_oldDescription; } //______________________________________________________________________________ |