From ec49596a3e66163ce811e8b64808df249a5cf637 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 31 May 2021 10:19:39 +0200 Subject: flatten SfxDocTplService_Impl a little Change-Id: Id3344141e4b65855717d4d480ab1a3a498fa2a1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116476 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/doc/doctemplates.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 4d9d521eeaa1..4e01f35583c7 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -184,7 +184,7 @@ class SfxDocTplService_Impl Sequence< OUString > maTemplateDirs; Sequence< OUString > maInternalTemplateDirs; OUString maRootURL; - std::vector< std::unique_ptr > maNames; + std::vector< NamePair_Impl > maNames; lang::Locale maLocale; Content maRootContent; bool mbIsInitialized : 1; @@ -501,11 +501,11 @@ void SfxDocTplService_Impl::readFolderList() const size_t nCount = std::min(SAL_N_ELEMENTS(TEMPLATE_SHORT_NAMES_ARY), SAL_N_ELEMENTS(TEMPLATE_LONG_NAMES_ARY)); for (size_t i = 0; i < nCount; ++i) { - std::unique_ptr pPair( new NamePair_Impl ); - pPair->maShortName = OUString::createFromAscii(TEMPLATE_SHORT_NAMES_ARY[i]); - pPair->maLongName = SfxResId(TEMPLATE_LONG_NAMES_ARY[i]); + NamePair_Impl aPair; + aPair.maShortName = OUString::createFromAscii(TEMPLATE_SHORT_NAMES_ARY[i]); + aPair.maLongName = SfxResId(TEMPLATE_LONG_NAMES_ARY[i]); - maNames.push_back( std::move(pPair) ); + maNames.push_back( aPair ); } } @@ -514,11 +514,11 @@ OUString SfxDocTplService_Impl::getLongName( const OUString& rShortName ) { OUString aRet; - for (auto const & pPair : maNames) + for (auto const & rPair : maNames) { - if ( pPair->maShortName == rShortName ) + if ( rPair.maShortName == rShortName ) { - aRet = pPair->maLongName; + aRet = rPair.maLongName; break; } } -- cgit v1.2.3