diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-22 14:04:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-02 11:12:15 +0100 |
commit | 23e9b1294471459d386152b1197cfe58514af5da (patch) | |
tree | 0c8705260a4f33810e4c69f09a09dca7031e0ea7 /i18npool/source/inputchecker/inputsequencechecker.cxx | |
parent | cc45c96770def8fb3cc8c6d6c3d385c592806ae9 (diff) |
loplugin:useuniqueptr in i18npool
Change-Id: Iff39b9298bfad474c5c011b6355b8ebf5be06318
Reviewed-on: https://gerrit.libreoffice.org/49091
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/source/inputchecker/inputsequencechecker.cxx')
-rw-r--r-- | i18npool/source/inputchecker/inputsequencechecker.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 6fdc99440f28..15426db1bc57 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -43,11 +43,6 @@ InputSequenceCheckerImpl::InputSequenceCheckerImpl(const char *pServiceName) InputSequenceCheckerImpl::~InputSequenceCheckerImpl() { - // Clear lookuptable - for (lookupTableItem* p : lookupTable) - delete p; - - lookupTable.clear(); } sal_Bool SAL_CALL @@ -113,8 +108,8 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage) return cachedItem->xISC; } else { - for (lookupTableItem* l : lookupTable) { - cachedItem = l; + for (auto& l : lookupTable) { + cachedItem = l.get(); if (cachedItem->aLanguage == rLanguage) return cachedItem->xISC; } @@ -127,7 +122,8 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage) if ( xI.is() ) { Reference< XExtendedInputSequenceChecker > xISC( xI, UNO_QUERY ); if (xISC.is()) { - lookupTable.push_back(cachedItem = new lookupTableItem(rLanguage, xISC)); + lookupTable.emplace_back(new lookupTableItem(rLanguage, xISC)); + cachedItem = lookupTable.back().get(); return cachedItem->xISC; } } |