diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-28 20:00:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-04 18:49:48 +0200 |
| commit | ce2792eda318b2760d24d2a744fc89e6a1d87138 (patch) | |
| tree | 55ee0998313380481b566c5ff9874f02d5ea5308 /package/inc | |
| parent | f9309a171a762b888bdfbea1dba8cbc1683be089 (diff) | |
use C++11 exception rethrowing
for those cases where we are doing relatively simple catching and rethrowing
e.g. catch in one thread and throw in main thread.
Change-Id: I6192017c4ec99dd671a9582f7b004096b0fc4525
Reviewed-on: https://gerrit.libreoffice.org/58588
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipOutputEntry.hxx | 6 | ||||
| -rw-r--r-- | package/inc/ZipOutputStream.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index 2e6c11dfa129..d95ffd4969ab 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -47,7 +47,7 @@ class ZipOutputEntry css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext; css::uno::Reference< css::xml::crypto::XDigestContext > m_xDigestContext; - ::css::uno::Any m_aParallelDeflateException; + std::exception_ptr m_aParallelDeflateException; CRC32 m_aCRC; ZipEntry *m_pCurrentEntry; @@ -70,9 +70,9 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt); void createBufferFile(); - void setParallelDeflateException(const ::css::uno::Any &rAny) { m_aParallelDeflateException = rAny; } + void setParallelDeflateException(const std::exception_ptr& exception) { m_aParallelDeflateException = exception; } css::uno::Reference< css::io::XInputStream > getData() const; - const css::uno::Any& getParallelDeflateException() const { return m_aParallelDeflateException; } + const std::exception_ptr& getParallelDeflateException() const { return m_aParallelDeflateException; } void closeBufferFile(); void deleteBufferFile(); diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 2c3e26fab4ac..3f86f07883ca 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -40,7 +40,7 @@ class ZipOutputStream ByteChucker m_aChucker; ZipEntry *m_pCurrentEntry; std::vector< ZipOutputEntry* > m_aEntries; - ::css::uno::Any m_aDeflateException; + std::exception_ptr m_aDeflateException; public: ZipOutputStream( |