simplify some OUString compareTo calls

to either startsWith or == or !=

Change-Id: Ie4b4662f5b8e4532cbc1ab36910389e0b3d41ef0
Reviewed-on: https://gerrit.libreoffice.org/39750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 64 insertions, 71 deletions

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 057f804a03b1..653e73da36ac 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3419,202 +3419,200 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
                         ft->Children[i], new OpIf, nResultSize));
                 break;
             case ocExternal:
-                if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getEffect")))
+                if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getEffect")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpEffective, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCumipmt")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCumipmt")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpCumipmt, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getNominal")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getNominal")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpNominal, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCumprinc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCumprinc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpCumprinc, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getXnpv")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getXnpv")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpXNPV, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getPricemat")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getPricemat")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpPriceMat, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getReceived")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getReceived")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpReceived, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getTbilleq")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getTbilleq")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpTbilleq, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getTbillprice")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getTbillprice")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpTbillprice, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getTbillyield")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getTbillyield")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpTbillyield, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getFvschedule")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getFvschedule")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpFvschedule, nResultSize));
                 }
-                /*else if ( !(pChild->GetExternal().compareTo(OUString(
-                    "com.sun.star.sheet.addin.Analysis.getYield"))))
+                /*else if ( pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getYield")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpYield));
                 }*/
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getYielddisc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getYielddisc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpYielddisc, nResultSize));
                 }
-                else    if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getYieldmat")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getYieldmat")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpYieldmat, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getAccrintm")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getAccrintm")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpAccrintm, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCoupdaybs")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCoupdaybs")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpCoupdaybs, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getDollarde")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getDollarde")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpDollarde, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getDollarfr")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getDollarfr")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpDollarfr, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCoupdays")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCoupdays")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpCoupdays, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCoupdaysnc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCoupdaysnc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpCoupdaysnc, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getDisc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getDisc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpDISC, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getIntrate")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getIntrate")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpINTRATE, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getPrice")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getPrice")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts,
                             ft->Children[i], new OpPrice, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCoupnum")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCoupnum")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpCoupnum, nResultSize));
                 }
-                /*else if ( !(pChild->GetExternal().compareTo(OUString(
-                   "com.sun.star.sheet.addin.Analysis.getDuration"))))
+                /*else if pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getDuration"))
                 {
                     mvSubArguments.push_back(
                         SoPHelper(mCalcConfig, ts, ft->Children[i], new OpDuration_ADD));
                 }*/
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getAmordegrc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getAmordegrc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpAmordegrc, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getAmorlinc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getAmorlinc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpAmorlinc, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getMduration")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getMduration")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpMDuration, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getXirr")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getXirr")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpXirr, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getOddlprice")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getOddlprice")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts,
                             ft->Children[i], new OpOddlprice, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getOddlyield")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getOddlyield")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpOddlyield, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getPricedisc")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getPricedisc")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts,
                             ft->Children[i], new OpPriceDisc, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCouppcd")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCouppcd")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpCouppcd, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getCoupncd")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getCoupncd")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpCoupncd, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getAccrint")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getAccrint")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpAccrint, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getSqrtpi")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getSqrtpi")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpSqrtPi, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getConvert")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getConvert")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpConvert, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getIseven")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getIseven")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpIsEven, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getIsodd")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getIsodd")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpIsOdd, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getMround")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getMround")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpMROUND, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getQuotient")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getQuotient")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpQuotient, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getSeriessum")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getSeriessum")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpSeriesSum, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getBesselj")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getBesselj")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpBesselj, nResultSize));
                 }
-                else if (!(pChild->GetExternal().compareTo("com.sun.star.sheet.addin.Analysis.getGestep")))
+                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getGestep")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpGestep, nResultSize));
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index f76cb2214a31..2aead2a4d511 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -171,11 +171,9 @@ ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() :
     pDoc(nullptr),
     pTrack(nullptr),
     pCurrentAction(nullptr),
-    sIDPrefix(SC_CHANGE_ID_PREFIX),
     nMultiSpanned(0),
     nMultiSpannedSlaveCount(0)
 {
-    nPrefixLength = sIDPrefix.getLength();
 }
 
 ScXMLChangeTrackingImportHelper::~ScXMLChangeTrackingImportHelper()
@@ -226,12 +224,11 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType
 sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const OUString& sID)
 {
     sal_uInt32 nResult(0);
-    sal_uInt32 nLength(sID.getLength());
-    if (nLength)
+    if (!sID.isEmpty())
     {
-        if (sID.compareTo(sIDPrefix, nPrefixLength) == 0)
+        if (sID.startsWith(SC_CHANGE_ID_PREFIX))
         {
-            OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength));
+            OUString sValue(sID.copy(strlen(SC_CHANGE_ID_PREFIX)));
             sal_Int32 nValue;
             ::sax::Converter::convertNumber(nValue, sValue);
             OSL_ENSURE(nValue > 0, "wrong change action ID");
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index 0f1d18f5cf5e..1fdeaec90903 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -180,8 +180,6 @@ class ScXMLChangeTrackingImportHelper
     ScDocument*         pDoc;
     ScChangeTrack*      pTrack;
     ScMyBaseAction*     pCurrentAction;
-    OUString            sIDPrefix;
-    sal_uInt32          nPrefixLength;
     sal_Int16           nMultiSpanned;
     sal_Int16           nMultiSpannedSlaveCount;
 
@@ -202,7 +200,7 @@ public:
     void SetProtection(const css::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; }
     void StartChangeAction(const ScChangeActionType nActionType);
 
-    sal_uInt32 GetIDFromString(const OUString& sID);
+    static sal_uInt32 GetIDFromString(const OUString& sID);
 
     void SetActionNumber(const sal_uInt32 nActionNumber) { pCurrentAction->nActionNumber = nActionNumber; }
     void SetActionState(const ScChangeActionState nActionState) { pCurrentAction->nActionState = nActionState; }
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ab95b71bc461..e680128eb643 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -630,7 +630,7 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext(  ScXMLImport&
         if (nPrefix == XML_NAMESPACE_TABLE)
         {
             if (IsXMLToken(aLocalName, XML_ID))
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
         }
     }
 }
@@ -692,7 +692,7 @@ ScXMLDependenceContext::ScXMLDependenceContext(  ScXMLImport& rImport,
         if (nPrefix == XML_NAMESPACE_TABLE)
         {
             if (IsXMLToken(aLocalName, XML_ID))
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
         }
     }
     pChangeTrackingImportHelper->AddDependence(nID);
@@ -764,7 +764,7 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext(  ScXMLImport& rImport,
         if (nPrefix == XML_NAMESPACE_TABLE)
         {
             if (IsXMLToken(aLocalName, XML_ID))
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
         }
     }
     pChangeTrackingImportHelper->AddDeleted(nID);
@@ -1124,7 +1124,7 @@ ScXMLPreviousContext::ScXMLPreviousContext(  ScXMLImport& rImport,
         if (nPrefix == XML_NAMESPACE_TABLE)
         {
             if (IsXMLToken(aLocalName, XML_ID))
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
         }
     }
 }
@@ -1176,7 +1176,7 @@ ScXMLContentChangeContext::ScXMLContentChangeContext(  ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nActionNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nActionNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_ACCEPTANCE_STATE))
             {
@@ -1187,7 +1187,7 @@ ScXMLContentChangeContext::ScXMLContentChangeContext(  ScXMLImport& rImport,
             }
             else if (IsXMLToken(aLocalName, XML_REJECTING_CHANGE_ID))
             {
-                nRejectingNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nRejectingNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
         }
     }
@@ -1267,7 +1267,7 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nActionNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nActionNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_ACCEPTANCE_STATE))
             {
@@ -1278,7 +1278,7 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
             }
             else if (IsXMLToken(aLocalName, XML_REJECTING_CHANGE_ID))
             {
-                nRejectingNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nRejectingNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_TYPE))
             {
@@ -1361,7 +1361,7 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_POSITION))
             {
@@ -1409,7 +1409,7 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nID = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nID = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_POSITION))
             {
@@ -1506,7 +1506,7 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nActionNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nActionNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_ACCEPTANCE_STATE))
             {
@@ -1517,7 +1517,7 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
             }
             else if (IsXMLToken(aLocalName, XML_REJECTING_CHANGE_ID))
             {
-                nRejectingNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nRejectingNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_TYPE))
             {
@@ -1613,7 +1613,7 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nActionNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nActionNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_ACCEPTANCE_STATE))
             {
@@ -1624,7 +1624,7 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
             }
             else if (IsXMLToken(aLocalName, XML_REJECTING_CHANGE_ID))
             {
-                nRejectingNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nRejectingNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
         }
     }
@@ -1694,7 +1694,7 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
         {
             if (IsXMLToken(aLocalName, XML_ID))
             {
-                nActionNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nActionNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
             else if (IsXMLToken(aLocalName, XML_ACCEPTANCE_STATE))
             {
@@ -1705,7 +1705,7 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
             }
             else if (IsXMLToken(aLocalName, XML_REJECTING_CHANGE_ID))
             {
-                nRejectingNumber = pChangeTrackingImportHelper->GetIDFromString(sValue);
+                nRejectingNumber = ScXMLChangeTrackingImportHelper::GetIDFromString(sValue);
             }
         }
     }