core.git: sw/source

[Mike Kaganski (via logerrit)]

 sw/source/core/text/itrcrsr.cxx |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 985e26bd407a7ec3f1b9fe002ab035e498b10055
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Apr 21 09:45:44 2025 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Apr 21 12:25:52 2025 +0200

    Flatten some code
    
    Change-Id: Ib0f82e88392b3da9a03477ee18e70827df7f09bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184404
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index e98f1cd4e459..1a8c500ef92f 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1654,29 +1654,29 @@ TextFrameIndex 
SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con
                 return nCurrStart;
             }
         }
-        else
+        else if (pPor->IsPostItsPortion())
         {
-            if (pPor->IsPostItsPortion() || pPor->InToxRefGrp())
+            if (SwPostItsPortion* pPostItsPortion = 
dynamic_cast<SwPostItsPortion*>(pPor))
             {
-                SwPostItsPortion* pPostItsPortion = pPor->IsPostItsPortion() ? 
dynamic_cast<SwPostItsPortion*>(pPor) : nullptr;
-                if (pPostItsPortion)
+                if (!pPostItsPortion->IsScript()) // tdf#141079
                 {
-                    if (!pPostItsPortion->IsScript()) // tdf#141079
-                    {
-                        // Offset would be nCurrStart + nLength below, do the 
same for post-it portions.
-                        nCurrStart += pPor->GetLen();
-                    }
+                    // Offset would be nCurrStart + nLength below, do the same 
for post-it portions.
+                    nCurrStart += pPor->GetLen();
                 }
-                return nCurrStart;
             }
-            if ( pPor->InFieldGrp() )
+            return nCurrStart;
+        }
+        else if (pPor->InToxRefGrp())
+        {
+            return nCurrStart;
+        }
+        else if (pPor->InFieldGrp())
+        {
+            if (bRightOver && !static_cast<SwFieldPortion*>(pPor)->HasFollow())
             {
-                if( bRightOver && 
!static_cast<SwFieldPortion*>(pPor)->HasFollow() )
-                {
-                    nCurrStart += 
static_cast<SwFieldPortion*>(pPor)->GetFieldLen();
-                }
-                return nCurrStart;
+                nCurrStart += 
static_cast<SwFieldPortion*>(pPor)->GetFieldLen();
             }
+            return nCurrStart;
         }
     }