core.git: sw/source

[Tomaž Vajngerl (via logerrit)]

 sw/source/core/tox/ToxLinkProcessor.cxx |    4 ++--
 sw/source/core/tox/ToxTextGenerator.cxx |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 25532c6213b3b7f6f9b75ef6fbb99de8baf64ec0
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Jul 26 13:25:19 2025 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jul 28 15:32:54 2025 +0200

    sw: Fix wrong variable prefix
    
    Change-Id: Icac2cf074667b70b79e31f6c97f09008514fbede
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188464
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx 
b/sw/source/core/tox/ToxLinkProcessor.cxx
index 498294eefe09..d208774d6efe 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -24,7 +24,7 @@ ToxLinkProcessor::StartNewLink(sal_Int32 startPosition, const 
UIName& characterS
     m_oStartedLink.emplace(startPosition, characterStyle);
 }
 
-void ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const OUString& url, 
const OUString& sAltText, bool bRelative)
+void ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const OUString& url, 
const OUString& rAltText, bool bRelative)
 {
     if (!m_oStartedLink)
     {
@@ -58,7 +58,7 @@ void ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const 
OUString& url, con
     sal_uInt16 poolId = ObtainPoolId(characterStyle);
     pClosedLink->mINetFormat.SetVisitedFormatAndId(characterStyle, poolId);
     pClosedLink->mINetFormat.SetINetFormatAndId(characterStyle, poolId);
-    pClosedLink->mINetFormat.SetName(sAltText);
+    pClosedLink->mINetFormat.SetName(rAltText);
 
     m_ClosedLinks.push_back(std::move(pClosedLink));
     m_oStartedLink.reset();
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index 4dc368ae04fa..5861dff49063 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -178,7 +178,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
     // FIXME this operates directly on the node text
     OUString & rText = const_cast<OUString&>(pTOXNd->GetText());
     rText.clear();
-    OUString rAltText;
+    OUString sAltText;
     for(sal_uInt16 nIndex = indexOfEntryToProcess; nIndex < 
indexOfEntryToProcess + numberOfEntriesToProcess; nIndex++)
     {
         if(nIndex > indexOfEntryToProcess)
@@ -215,7 +215,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
             {
                 HandledTextToken htt = HandleTextToken(rBase, 
rDoc.GetAttrPool(), pLayout);
                 ApplyHandledTextToken(htt, *pTOXNd);
-                rAltText += htt.text;
+                sAltText += htt.text;
             }
             break;
 
@@ -225,7 +225,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
                 rText += GetNumStringOfFirstNode(rBase, true, MAXLEVEL, 
pLayout);
                 HandledTextToken htt = HandleTextToken(rBase, 
rDoc.GetAttrPool(), pLayout);
                 ApplyHandledTextToken(htt, *pTOXNd);
-                rAltText += htt.text;
+                sAltText += htt.text;
             }
             break;
 
@@ -252,7 +252,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
 
             case TOKEN_LINK_START:
                 mLinkProcessor->StartNewLink(rText.getLength(), 
aToken.sCharStyleName);
-                rAltText = "";
+                sAltText = "";
                 break;
 
             case TOKEN_LINK_END:
@@ -265,7 +265,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
                         ++iter->second;
                         url = "#" + OUString::number(iter->second) + url;
                     }
-                    mLinkProcessor->CloseLink(rText.getLength(), url, 
rAltText, /*bRelative=*/true);
+                    mLinkProcessor->CloseLink(rText.getLength(), url, 
sAltText, /*bRelative=*/true);
                 }
                 break;
 
@@ -286,7 +286,7 @@ ToxTextGenerator::GenerateText(SwDoc& rDoc,
                         OUString aURL = SwTOXAuthority::GetSourceURL(
                             rAuthority.GetText(AUTH_FIELD_URL, pLayout));
 
-                        mLinkProcessor->CloseLink(rText.getLength(), aURL, 
rAltText, /*bRelative=*/false);
+                        mLinkProcessor->CloseLink(rText.getLength(), aURL, 
sAltText, /*bRelative=*/false);
                     }
                 }
                 break;