summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-01 14:42:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-07 07:12:39 +0100
commit8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 (patch)
treed41feeea533127280e0503d0dc2dd55a4ab83ce8 /sdext
parent4f810905fa74128871f2fe924a3d28a79f4e4261 (diff)
log nice exception messages whereever possible
Change-Id: Idd125c18bee1a39b9ea8cc4f8c55cddfd37c33e1 Reviewed-on: https://gerrit.libreoffice.org/68579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx6
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx5
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx4
3 files changed, 10 insertions, 5 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index f0e16bd12461..a711610bc0aa 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -28,6 +28,7 @@
#include <comphelper/propertysequence.hxx>
#include <sal/macros.h>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -328,10 +329,11 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
}
}
}
- catch (const Exception& rException)
+ catch (const Exception&)
{
+ css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("sdext.minimizer", "caught exception while getting configuration node "
- << sPathToNode << " : " << rException);
+ << sPathToNode << " : " << exceptionToString(ex));
}
return xNode;
}
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index f2c5569a4dec..58fc6a6d058f 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -149,9 +149,10 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
return rxNode->getByHierarchicalName(sPathToNode);
}
}
- catch (const Exception& rException)
+ catch (const Exception&)
{
- SAL_WARN("sdext.presenter", "caught exception while getting configuration node " << sPathToNode << " : " << rException);
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN("sdext.presenter", "caught exception while getting configuration node " << sPathToNode << " : " << exceptionToString(ex));
}
return Any();
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index eb995dd935b3..59350c34f3fa 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/rendering/CompositeOperation.hpp>
#include <com/sun/star/rendering/TextDirection.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -1061,7 +1062,8 @@ PresenterTextCaret::~PresenterTextCaret()
}
catch (uno::Exception const&)
{
- SAL_WARN("sdext.presenter", "unexpected exception in ~PresenterTextCaret");
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN("sdext.presenter", "unexpected exception in ~PresenterTextCaret " << exceptionToString(ex));
}
}