diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-25 11:09:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-21 10:36:39 +0200 |
| commit | e26f8d2592a3d7cc5b43b3246b364397dd704f0d (patch) | |
| tree | 8677f333ba26a23f2999ab3a083696a8d2e29b74 /sc/inc | |
| parent | 3dce7bd77c56e61cd9457b03e8cf4137a7630eb9 (diff) | |
coverity#1401307 document checked 'Uncaught exception'
markup std::unique_ptr where coverity warns a dtor might throw exceptions which
won't throw in practice, or where std::terminate is an acceptable response if
they do
Change-Id: Icc99cdecf8d8b011e599574f0a05b59efd1c65c2
Reviewed-on: https://gerrit.libreoffice.org/41561
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/document.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/funcuno.hxx | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 35ea5104b090..a2a073a68ab2 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -36,6 +36,7 @@ #include "typedstrdata.hxx" #include "calcmacros.hxx" #include "calcconfig.hxx" +#include <o3tl/deleter.hxx> #include <svl/hint.hxx> #include <tools/gen.hxx> #include <svl/zforlist.hxx> @@ -2386,6 +2387,8 @@ private: void SetNeedsListeningGroups( const std::vector<ScAddress>& rPosArray ); }; +typedef std::unique_ptr<ScDocument, o3tl::default_delete<ScDocument>> ScDocumentUniquePtr; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index cf0dc8065a1b..174975c8a1f9 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -26,8 +26,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> +#include "document.hxx" -class ScDocument; class ScDocOptions; css::uno::Reference< css::uno::XInterface > SAL_CALL @@ -37,7 +37,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL class ScTempDocCache { private: - std::unique_ptr<ScDocument> xDoc; + ScDocumentUniquePtr xDoc; bool bInUse; public: |