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

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/textboxhelper.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d9061f32b5d225f221e9399c5fa54996a6f7f43b
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Jan 5 20:08:58 2022 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Jan 6 08:31:51 2022 +0100

    sw textbox: pShape -> pFormat for frame formats
    
    A frame format can be a fly or a draw frame format. Only the later is a
    shape.
    
    Also this way the parameter name in the definition matches the
    declaration, improving readability.
    
    Change-Id: I69e51bfaceba925002d23cdfb5fa6d60afa3c550
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128023
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 3ad9f5ec5f48..65f6e2e03863 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -1527,16 +1527,16 @@ bool 
SwTextBoxHelper::DoTextBoxZOrderCorrection(SwFrameFormat* pShape, const Sdr
 }
 
 void SwTextBoxHelper::synchronizeGroupTextBoxProperty(bool 
pFunc(SwFrameFormat*, SdrObject*),
-                                                      SwFrameFormat* pShape, 
SdrObject* pObj)
+                                                      SwFrameFormat* pFormat, 
SdrObject* pObj)
 {
     if (auto pChildren = pObj->getChildrenOfSdrObject())
     {
         for (size_t i = 0; i < pChildren->GetObjCount(); ++i)
-            synchronizeGroupTextBoxProperty(pFunc, pShape, 
pChildren->GetObj(i));
+            synchronizeGroupTextBoxProperty(pFunc, pFormat, 
pChildren->GetObj(i));
     }
     else
     {
-        (*pFunc)(pShape, pObj);
+        (*pFunc)(pFormat, pObj);
     }
 }