[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/doc/textboxhelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 334fcc3b98f6e047675651f673f8e970de3edc73
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 12 09:52:40 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 12 12:18:34 2023 +0200

    drop solarmutex guard from SwTextBoxHelper::isTextBox
    
    this path is very hot on some workloads, and AFAICT the SolarMutex is
    already taken on all paths leading here.
    But leave a DBG_TESTSOLARMUTEX just to be sure.
    
    Change-Id: Ida278360a8f740b2490574eea5411d952287b10c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151690
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index e87a28ba4cfd..1bb09d55b753 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -297,7 +297,7 @@ void SwTextBoxHelper::destroy(const SwFrameFormat* pShape, 
const SdrObject* pObj
 bool SwTextBoxHelper::isTextBox(const SwFrameFormat* pFormat, sal_uInt16 nType,
                                 const SdrObject* pObject)
 {
-    SolarMutexGuard aGuard;
+    DBG_TESTSOLARMUTEX();
     assert(nType == RES_FLYFRMFMT || nType == RES_DRAWFRMFMT);
     if (!pFormat || pFormat->Which() != nType)
         return false;