summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-20 17:04:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-23 08:15:49 +0200
commit00dd50d1a82d04df2baebcc3ae2f5ddab5c43997 (patch)
tree6e835b670d99a6087992386b603a27c153ba5857 /ucb
parentd23b20661c83ebb722e4602d0ef9d65ce1ecfa6d (diff)
loplugin:useuniqueptr in CachedContentResultSet::CCRS_Cache
Change-Id: Idb2dd770ef39119f2a6ee6989bb983c3c77a1d68 Reviewed-on: https://gerrit.libreoffice.org/53235 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx10
-rw-r--r--ucb/source/cacher/cachedcontentresultset.hxx2
2 files changed, 5 insertions, 7 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index bf343123616c..0c7bc5ef2a76 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -246,8 +246,7 @@ bool CachedContentResultSet::CCRS_Cache
void CachedContentResultSet::CCRS_Cache
::clearMappedReminder()
{
- delete m_pMappedReminder;
- m_pMappedReminder = nullptr;
+ m_pMappedReminder.reset();
}
Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache
@@ -256,11 +255,10 @@ Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache
if( !m_pMappedReminder )
{
sal_Int32 nCount = m_pResult->Rows.getLength();
- m_pMappedReminder = new Sequence< sal_Bool >( nCount );
- for( ;nCount; nCount-- )
- (*m_pMappedReminder)[nCount] = false;
+ m_pMappedReminder.reset(new Sequence< sal_Bool >( nCount ));
+ std::fill(m_pMappedReminder->begin(), m_pMappedReminder->end(), false);
}
- return m_pMappedReminder;
+ return m_pMappedReminder.get();
}
const Any& CachedContentResultSet::CCRS_Cache
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 51e73b1317bd..174fb91ff568 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -56,7 +56,7 @@ class CachedContentResultSet
m_pResult;
css::uno::Reference< css::ucb::XContentIdentifierMapping >
m_xContentIdentifierMapping;
- css::uno::Sequence< sal_Bool >* m_pMappedReminder;
+ std::unique_ptr<css::uno::Sequence< sal_Bool >> m_pMappedReminder;
private:
/// @throws css::sdbc::SQLException