diff options
Diffstat (limited to 'desktop/source/deployment')
8 files changed, 17 insertions, 25 deletions
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index c03caaef2461..c3de88643003 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -78,7 +78,7 @@ void ProgressLogImpl::disposing() } } catch (const Exception & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } } @@ -136,7 +136,7 @@ void ProgressLogImpl::log_write( OString const & text ) } } catch (const io::IOException & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 8b311528e7ce..59138ad44214 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -724,7 +724,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() xFilePicker->appendFilter( iPos->first, iPos->second ); } catch (const lang::IllegalArgumentException & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } } xFilePicker->setCurrentFilter( sDefaultFilter ); @@ -1377,7 +1377,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage } catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); bRegistered = false; } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index fa8724c84ccb..137d2358a02c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -342,7 +342,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym throw; } catch (const uno::Exception & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); return NOT_AVAILABLE; } } diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index a19a5c728516..5aaee07a2194 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -145,9 +145,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) } catch (const css::ucb::ContentCreationException& e) { - SAL_WARN( - "desktop.deployment", - "ignoring ContentCreationException \"" << e.Message << "\""); + SAL_WARN("desktop.deployment", "ignoring " << e); } } return aLocationURL; @@ -217,9 +215,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) dp_misc::getIdentifier(info.extension), info.extension->getName(), uno::Reference<css_ucb::XCommandEnvironment>()); } catch (const lang::IllegalArgumentException& e) { - SAL_WARN( - "desktop.deployment", - "ignoring IllegalArgumentException \"" << e.Message << "\""); + SAL_WARN("desktop.deployment", "ignoring " << e); continue; } OSL_ASSERT(extensions.getLength() == 3); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index b9b849d31b8a..5667ffc126fb 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -583,7 +583,7 @@ OUString PackageManagerImpl::detectMediaType( catch (const lang::IllegalArgumentException & exc) { if (throw_exc) throw; - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } } return mediaType; @@ -1026,11 +1026,11 @@ PackageManagerImpl::getDeployedPackages_( } catch (const lang::IllegalArgumentException & exc) { // ignore - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } catch (const deployment::DeploymentException& exc) { // ignore - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } } return comphelper::containerToSequence(packages); @@ -1265,7 +1265,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( } catch( const uno::Exception & e ) { - SAL_WARN("desktop.deployment", e.Message); + SAL_WARN("desktop.deployment", e); } } return bModified; @@ -1403,7 +1403,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( catch (const uno::Exception & e) { // Looks like exceptions being caught here is not an uncommon case. - SAL_WARN("desktop.deployment", e.Message); + SAL_WARN("desktop.deployment", e); } } return bModified; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 4c5805b4b54a..bfac300cd95e 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1394,13 +1394,11 @@ void BackendImpl::ComponentPackageImpl::processPackage_( componentLiveInsertion(data, factories); } catch (css::uno::Exception & e) { SAL_INFO( - "desktop.deployment", "caught Exception " << e.Message); + "desktop.deployment", "caught " << e); try { impreg->revokeImplementation(url, rdb); } catch (css::uno::RuntimeException & e2) { - SAL_WARN( - "desktop.deployment", - "ignored RuntimeException " << e2.Message); + SAL_WARN("desktop.deployment", "ignored " << e2); } throw; } diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index f55910f13699..8bebe6cbec98 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -648,9 +648,7 @@ void Package::processPackage_impl( static_cast< OWeakObject * >(this), e); } catch (const RuntimeException &e) { - SAL_WARN( - "desktop.deployment", - "unexpected RuntimeException \"" << e.Message << '"'); + SAL_WARN("desktop.deployment", "unexpected " << e); throw; } catch (const CommandFailedException &) { diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index d3d29d904dfc..af12c6b09f3f 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1059,7 +1059,7 @@ void BackendImpl::PackageImpl::exportTo( ::cppu::getCaughtException() ) ); } catch (const lang::IllegalArgumentException & exc) { - SAL_WARN( "desktop", exc.Message ); + SAL_WARN( "desktop", exc ); } std::vector< Sequence<beans::PropertyValue> > manifest; @@ -1141,7 +1141,7 @@ void BackendImpl::PackageImpl::exportTo( catch (const css::ucb::ContentCreationException &e) { SAL_WARN( - "desktop.deployment", "exception on overwriting manifest: " << e.Message); + "desktop.deployment", "exception on overwriting manifest: " << e); } if (!bSuccess) |