mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:useuniqueptr in lcl_LookupTableHelper

Browse Source 
Change-Id: I8ee34ced61a23d7ade71b25f547c607cd4fe37bb
Reviewed-on: https://gerrit.libreoffice.org/60968
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-09-25 13:23:34 +02:00
parent a39166b985
commit 0699a18c62
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
i18npool/source/localedata/localedata.cxx
View File

@@ -481,11 +481,11 @@ public:
oslGenericFunction getFunctionSymbolByName( oslGenericFunction getFunctionSymbolByName(
const OUString& localeName, const sal_Char* pFunction, const OUString& localeName, const sal_Char* pFunction,
LocaleDataLookupTableItem** pOutCachedItem ); std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem );
private: private:
::osl::Mutex maMutex; ::osl::Mutex maMutex;
::std::vector< LocaleDataLookupTableItem* > maLookupTable; ::std::vector< LocaleDataLookupTableItem > maLookupTable;
}; };
// from instance.hxx: Helper base class for a late-initialized // from instance.hxx: Helper base class for a late-initialized
@@ -502,20 +502,14 @@ lcl_LookupTableHelper::lcl_LookupTableHelper()
lcl_LookupTableHelper::~lcl_LookupTableHelper() lcl_LookupTableHelper::~lcl_LookupTableHelper()
{ {
std::vector<LocaleDataLookupTableItem*>::const_iterator aEnd(maLookupTable.end()); for ( LocaleDataLookupTableItem& item : maLookupTable ) {
std::vector<LocaleDataLookupTableItem*>::iterator aIter(maLookupTable.begin()); delete item.module;
for ( ; aIter != aEnd; ++aIter ) {
LocaleDataLookupTableItem* pItem = *aIter;
delete pItem->module;
delete pItem;
} }
maLookupTable.clear();
} }
oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName( oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
const OUString& localeName, const sal_Char* pFunction, const OUString& localeName, const sal_Char* pFunction,
LocaleDataLookupTableItem** pOutCachedItem ) std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem )
{ {
OUString aFallback; OUString aFallback;
bool bFallback = (localeName.indexOf( cUnder) < 0); bool bFallback = (localeName.indexOf( cUnder) < 0);
@@ -540,14 +534,14 @@ oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
strlen(i.pLocale) + 1 + strlen(pFunction))); strlen(i.pLocale) + 1 + strlen(pFunction)));
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
for (LocaleDataLookupTableItem* pCurrent : maLookupTable) for (LocaleDataLookupTableItem & rCurrent : maLookupTable)
{ {
if (pCurrent->dllName == i.pLib) if (rCurrent.dllName == i.pLib)
{ {
OSL_ASSERT( pOutCachedItem ); OSL_ASSERT( pOutCachedItem );
if( pOutCachedItem ) if( pOutCachedItem )
{ {
(*pOutCachedItem) = new LocaleDataLookupTableItem( *pCurrent ); (*pOutCachedItem).reset(new LocaleDataLookupTableItem( rCurrent ));
(*pOutCachedItem)->localeName = i.pLocale; (*pOutCachedItem)->localeName = i.pLocale;
return (*pOutCachedItem)->module->getFunctionSymbol( return (*pOutCachedItem)->module->getFunctionSymbol(
aBuf.appendAscii( pFunction).append( cUnder). aBuf.appendAscii( pFunction).append( cUnder).
@@ -570,12 +564,11 @@ oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
if ( module->loadRelative(&thisModule, aBuf.makeStringAndClear()) ) if ( module->loadRelative(&thisModule, aBuf.makeStringAndClear()) )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
LocaleDataLookupTableItem* pNewItem = new LocaleDataLookupTableItem(i.pLib, module, i.pLocale); maLookupTable.emplace_back(i.pLib, module, i.pLocale);
maLookupTable.push_back(pNewItem);
OSL_ASSERT( pOutCachedItem ); OSL_ASSERT( pOutCachedItem );
if( pOutCachedItem ) if( pOutCachedItem )
{ {
(*pOutCachedItem) = new LocaleDataLookupTableItem( *pNewItem ); pOutCachedItem->reset(new LocaleDataLookupTableItem( maLookupTable.back() ));
return module->getFunctionSymbol( return module->getFunctionSymbol(
aBuf.appendAscii(pFunction).append(cUnder). aBuf.appendAscii(pFunction).append(cUnder).
appendAscii((*pOutCachedItem)->localeName).makeStringAndClear()); appendAscii((*pOutCachedItem)->localeName).makeStringAndClear());
@@ -1455,7 +1448,7 @@ oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, con
} }
oslGenericFunction pSymbol = nullptr; oslGenericFunction pSymbol = nullptr;
LocaleDataLookupTableItem *pCachedItem = nullptr; std::unique_ptr<LocaleDataLookupTableItem> pCachedItem;
// Load function with name <func>_<lang>_<country> or <func>_<bcp47> and // Load function with name <func>_<lang>_<country> or <func>_<bcp47> and
// fallbacks. // fallbacks.
@@ -1482,7 +1475,7 @@ oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, con
throw RuntimeException(); throw RuntimeException();
if (pCachedItem) if (pCachedItem)
cachedItem.reset(pCachedItem); cachedItem = std::move(pCachedItem);
if (cachedItem.get()) if (cachedItem.get())
cachedItem->aLocale = rLocale; cachedItem->aLocale = rLocale;
@@ -1500,16 +1493,12 @@ LocaleDataImpl::getAllInstalledLocaleNames()
// Check if the locale is really available and not just in the table, // Check if the locale is really available and not just in the table,
// don't allow fall backs. // don't allow fall backs.
LocaleDataLookupTableItem *pCachedItem = nullptr; std::unique_ptr<LocaleDataLookupTableItem> pCachedItem;
if (lcl_LookupTableStatic::get().getFunctionSymbolByName( name, "getLocaleItem", &pCachedItem )) { if (lcl_LookupTableStatic::get().getFunctionSymbolByName( name, "getLocaleItem", &pCachedItem )) {
if( pCachedItem ) if( pCachedItem )
cachedItem.reset( pCachedItem ); cachedItem = std::move( pCachedItem );
seq[nInstalled++] = LanguageTag::convertToLocale( name.replace( cUnder, cHyphen), false); seq[nInstalled++] = LanguageTag::convertToLocale( name.replace( cUnder, cHyphen), false);
} }
else
{
delete pCachedItem;
}
} }
if ( nInstalled < nbOfLocales ) if ( nInstalled < nbOfLocales )
seq.realloc( nInstalled ); // reflect reality seq.realloc( nInstalled ); // reflect reality