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

[Michael Stahl (via logerrit)]

 tools/source/fsys/urlobj.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6c9d853edcb1f76468bc96b2e8d7e60dcfa72c7e
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Nov 22 18:57:50 2021 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Nov 23 07:40:04 2021 +0100

    tools: fix INetURLObject::changeScheme()
    
    (regression from dc2010964fb8d18d5c4fe96172ee082276a1e587
     which broke JunitTest_ucb_unoapi)
    
    Change-Id: I14a79c3b7d1161234da64822186bcf97d4022264
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125671
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index adc73849b5f0..085c6d2846f0 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -1479,14 +1479,15 @@ void INetURLObject::changeScheme(INetProtocol 
eTargetScheme) {
     OUString aTmpStr=m_aAbsURIRef.toString();
     m_aAbsURIRef.setLength(0);
     int oldSchemeLen = 0;
-    const OUString& aSchemeName = getSchemeInfo().m_sScheme;
+    const OUString& rOldSchemeName = getSchemeInfo().m_sScheme;
     if (m_eScheme == INetProtocol::Generic)
         oldSchemeLen = m_aScheme.getLength();
     else
-        oldSchemeLen = aSchemeName.getLength();
+        oldSchemeLen = rOldSchemeName.getLength();
     m_eScheme=eTargetScheme;
-    int newSchemeLen = aSchemeName.getLength();
-    m_aAbsURIRef.append(aSchemeName);
+    const OUString& rNewSchemeName = getSchemeInfo().m_sScheme;
+    int newSchemeLen = rNewSchemeName.getLength();
+    m_aAbsURIRef.append(rNewSchemeName);
     m_aAbsURIRef.append(aTmpStr.getStr()+oldSchemeLen);
     int delta=newSchemeLen-oldSchemeLen;
     m_aUser+=delta;