summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-12-21 14:45:06 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-12-21 14:45:06 +0100
commit1533e16e0085f383b08a66573f18b2844950d5ab (patch)
tree90d1d875678a944795fedd81cea90d221dad4eca /extensions
parent3314946fde9aa5984af0b0bbc07dee686e51394b (diff)
oooimprovement7: #i116158# catching exceptions around whole block
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 53cc9bd7a2b9..d83c43bfcfd8 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -128,21 +128,21 @@ namespace
}
{
::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
- if(m_ServiceFactory.is())
+ try
{
- if(Config(m_ServiceFactory).getInvitationAccepted())
+ if(m_ServiceFactory.is())
{
- try
+ if(Config(m_ServiceFactory).getInvitationAccepted())
{
packLogs(m_ServiceFactory);
uploadLogs(m_ServiceFactory);
}
- catch( com::sun::star::uno::Exception) {}
+ else
+ LogStorage(m_ServiceFactory).clear();
}
- else
- LogStorage(m_ServiceFactory).clear();
+ m_ServiceFactory.clear();
}
- m_ServiceFactory.clear();
+ catch(...) {}
}
}