diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-19 12:16:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-19 18:42:40 +0200 |
| commit | b462867b420f42ac2d1bcf0e313d2085478dc30b (patch) | |
| tree | 8a49503326b3acca285e5c4259a28402b9302b8c /ucb | |
| parent | 09394e0d6987345f30b316ff44cf007199ec8f09 (diff) | |
no need to allocate FetchResult separately in CCRS_Cache
Change-Id: Ia4d85bd6f7c667a612b247178e4f1a2321f7940c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119211
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultset.hxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 68ef19d627e6..f5563c9310d6 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -142,7 +142,7 @@ void CachedContentResultSet::CCRS_Cache ::loadData( const FetchResult& rResult ) { clear(); - m_pResult.reset( new FetchResult( rResult ) ); + m_pResult = rResult; } bool CachedContentResultSet::CCRS_Cache diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 3c20996b115f..ee3b737d6f6f 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -33,7 +33,6 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <memory> #include <optional> namespace com::sun::star::script { @@ -51,7 +50,7 @@ class CachedContentResultSet class CCRS_Cache { private: - std::unique_ptr<css::ucb::FetchResult> + std::optional<css::ucb::FetchResult> m_pResult; css::uno::Reference< css::ucb::XContentIdentifierMapping > m_xContentIdentifierMapping; |