vcl/source/app/svapp.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit a51d5b5d511980f4b6f32382b456170dcf928849 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Jan 15 11:59:59 2025 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Dec 2 08:54:32 2025 +0100 Rename file-local ImplYield() to InnerYield() to reduce potential confusion There are other functions called ImplYield in vcl, it's annoying to confuse them. Signed-off-by: Tor Lillqvist <[email protected]> Change-Id: Id184f96d74a88dc9b90181a4945f0707865d24f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194565 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index dd11e4912a4c..604fd0b5192b 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -372,14 +372,14 @@ void Application::Execute() GetpApp()->Shutdown(); } -static bool ImplYield(bool i_bWait, bool i_bAllEvents) +static bool InnerYield(bool i_bWait, bool i_bAllEvents) { ImplSVData* pSVData = ImplGetSVData(); - SAL_INFO("vcl.schedule", "Enter ImplYield: " << (i_bWait ? "wait" : "no wait") << + SAL_INFO("vcl.schedule", "Enter InnerYield: " << (i_bWait ? "wait" : "no wait") << ": " << (i_bAllEvents ? "all events" : "one event")); - // there's a data race here on WNT only because ImplYield may be + // there's a data race here on WNT only because InnerYield may be // called without SolarMutex; but the only remaining use of mnDispatchLevel // is in OSX specific code pSVData->maAppData.mnDispatchLevel++; @@ -393,7 +393,7 @@ static bool ImplYield(bool i_bWait, bool i_bAllEvents) DBG_TESTSOLARMUTEX(); // must be locked on return from Yield - SAL_INFO("vcl.schedule", "Leave ImplYield with return " << bProcessedEvent ); + SAL_INFO("vcl.schedule", "Leave InnerYield with return " << bProcessedEvent ); return bProcessedEvent; } @@ -412,7 +412,7 @@ bool Application::Reschedule( bool i_bAllEvents ) nOldView = comphelper::LibreOfficeKit::getView(); nOldDocId = comphelper::LibreOfficeKit::getDocId(); } - bool bRet = ImplYield(false, i_bAllEvents); + bool bRet = InnerYield(false, i_bAllEvents); if (comphelper::LibreOfficeKit::isActive()) { // Yield may have changed the current docId, restore the old value, @@ -446,7 +446,7 @@ void Scheduler::ProcessEventsToIdle() assert(pSVData->maSchedCtx.mnIdlesLockCount == 0); #endif int nSanity = 1; - while (ImplYield(false, true)) + while (InnerYield(false, true)) { if (0 == ++nSanity % 1000) { @@ -499,7 +499,7 @@ void Application::Yield() SAL_WARN("vcl.schedule", "Application::Yield()"); std::abort(); } - ImplYield(true, false); + InnerYield(true, false); } IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*, void )
