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

Move extension preparation out of the loop

Browse Source 
Change-Id: I6e4b5397e3d0ae9b943e261e9fca95735ccc9a73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132866
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2022-04-13 07:49:32 +01:00
parent 55c7691fad
commit b210c45d19
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sfx2/source/bastyp/fltfnc.cxx
View File

@@ -652,23 +652,22 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4Extension( const OU
{ {
if ( m_rImpl.pList ) if ( m_rImpl.pList )
{ {
for (const std::shared_ptr<const SfxFilter>& pFilter : *m_rImpl.pList) if (OUString sExt = ToUpper_Impl(rExt); !sExt.isEmpty())
{ {
SfxFilterFlags nFlags = pFilter->GetFilterFlags(); if (sExt[0] != '.')
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) ) sExt = "." + sExt;
for (const std::shared_ptr<const SfxFilter>& pFilter : *m_rImpl.pList)
{ {
OUString sWildCard = ToUpper_Impl( pFilter->GetWildcard().getGlob() ); SfxFilterFlags nFlags = pFilter->GetFilterFlags();
OUString sExt = ToUpper_Impl( rExt ); if ((nFlags & nMust) == nMust && !(nFlags & nDont))
{
OUString sWildCard = ToUpper_Impl(pFilter->GetWildcard().getGlob());
if (sExt.isEmpty()) WildCard aCheck(sWildCard, ';');
continue; if (aCheck.Matches(sExt))
return pFilter;
if (sExt[0] != '.') }
sExt = "." + sExt;
WildCard aCheck(sWildCard, ';');
if (aCheck.Matches(sExt))
return pFilter;
} }
} }