ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

lok: Replace loop with std::find_if(...)

Browse Source 
Change-Id: Icfe912f7b79454b9d208c39382ba187d0a0c16c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161810
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Attila Szűcs <attila.szucs@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162045
Tested-by: Jenkins
This commit is contained in:
Aron Budea
2024-01-14 16:37:41 +01:00
parent 1ad8f52476
commit 1bc6a730ec
1 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfx2/source/view/lokhelper.cxx
+32 -35
View File
@@ -184,44 +184,41 @@ void SfxLokHelper::setView(int nId)
const ViewShellId nViewShellId(nId);
std::vector<SfxViewShell*>& rViewArr = pApp->GetViewShells_Impl();
for (const SfxViewShell* pViewShell : rViewArr)
const auto itViewShell = std::find_if(rViewArr.begin(), rViewArr.end(), [nViewShellId](SfxViewShell* pViewShell){ return pViewShell->GetViewShellId() == nViewShellId; });
if (itViewShell == rViewArr.end())
return;
const SfxViewShell* pViewShell = *itViewShell;
DisableCallbacks dc;
bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
if (bIsCurrShell && comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == pViewShell->GetLOKLanguageTag().getBcp47())
return;
if (bIsCurrShell)
{
if (pViewShell->GetViewShellId() == nViewShellId)
{
DisableCallbacks dc;
bool bIsCurrShell = (pViewShell == SfxViewShell::Current());
if (bIsCurrShell && comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == pViewShell->GetLOKLanguageTag().getBcp47())
return;
if (bIsCurrShell)
{
// If we wanted to set the SfxViewShell that is actually set, we could skip it.
// But it looks like that the language can go wrong, so we have to fix that.
// This can happen, when someone sets the language or SfxViewShell::Current() separately.
SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) lang:"
<< comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
<< " new lang:" << pViewShell->GetLOKLanguageTag().getBcp47());
}
// update the current LOK language and locale for the dialog tunneling
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
if (bIsCurrShell)
return;
SfxViewFrame& rViewFrame = pViewShell->GetViewFrame();
rViewFrame.MakeActive_Impl(false);
// Make comphelper::dispatchCommand() find the correct frame.
uno::Reference<frame::XFrame> xFrame = rViewFrame.GetFrame().GetFrameInterface();
uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(comphelper::getProcessComponentContext());
xDesktop->setActiveFrame(xFrame);
return;
}
// If we wanted to set the SfxViewShell that is actually set, we could skip it.
// But it looks like that the language can go wrong, so we have to fix that.
// This can happen, when someone sets the language or SfxViewShell::Current() separately.
SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) lang:"
<< comphelper::LibreOfficeKit::getLanguageTag().getBcp47()
<< " new lang:" << pViewShell->GetLOKLanguageTag().getBcp47());
}
// update the current LOK language and locale for the dialog tunneling
comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
if (bIsCurrShell)
return;
SfxViewFrame& rViewFrame = pViewShell->GetViewFrame();
rViewFrame.MakeActive_Impl(false);
// Make comphelper::dispatchCommand() find the correct frame.
uno::Reference<frame::XFrame> xFrame = rViewFrame.GetFrame().GetFrameInterface();
uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(comphelper::getProcessComponentContext());
xDesktop->setActiveFrame(xFrame);
}
SfxViewShell* SfxLokHelper::getViewOfId(int nId)