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/calendar | |
| 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/calendar')
| -rw-r--r-- | i18npool/source/calendar/calendarImpl.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index c40735b83761..2f3ffc5c1043 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -36,10 +36,6 @@ CalendarImpl::CalendarImpl(const Reference< XComponentContext > &rxContext) : m_ CalendarImpl::~CalendarImpl() { - // Clear lookuptable - for (lookupTableItem* p : lookupTable) - delete p; - lookupTable.clear(); } void SAL_CALL @@ -62,9 +58,9 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) sal_Int32 i; for (i = 0; i < sal::static_int_cast<sal_Int32>(lookupTable.size()); i++) { - lookupTableItem *listItem = lookupTable[i]; - if (uniqueID == listItem->uniqueID) { - xCalendar = listItem->xCalendar; + lookupTableItem &listItem = lookupTable[i]; + if (uniqueID == listItem.uniqueID) { + xCalendar = listItem.xCalendar; break; } } @@ -88,7 +84,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) throw ERROR; xCalendar.set(xI, UNO_QUERY); - lookupTable.push_back( new lookupTableItem(uniqueID, xCalendar) ); + lookupTable.emplace_back( uniqueID, xCalendar ); } if ( !xCalendar.is() ) |