Translate German variable names

Akt -> Current in ww8 (leftovers in function names)

Change-Id: I7ce1df76be01108d0e1f23522b09e20f75ae4ed3
Reviewed-on: https://gerrit.libreoffice.org/49903
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

5 files changed, 28 insertions, 28 deletions

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index f628098fbe3d..3b3aea37ca15 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1047,10 +1047,10 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                         {
                             while (aSprmIter.GetSprms())
                             {
-                                const sal_uInt8 *const pParams(aSprmIter.GetAktParams());
+                                const sal_uInt8 *const pParams(aSprmIter.GetCurrentParams());
                                 if (nullptr == pParams)
                                     break;
-                                sal_uInt16 nAktId = aSprmIter.GetAktId();
+                                sal_uInt16 nAktId = aSprmIter.GetCurrentId();
                                 switch( nAktId )
                                 {
                                     case     75:
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index d53929288c57..acfb4b1abcb6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1772,9 +1772,9 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
         for (int nLoop = 0; nLoop < 2; ++nLoop)
         {
             const sal_uInt8* pParams;
-            while (aSprmIter.GetSprms() && nullptr != (pParams = aSprmIter.GetAktParams()))
+            while (aSprmIter.GetSprms() && nullptr != (pParams = aSprmIter.GetCurrentParams()))
             {
-                sal_uInt16 nId = aSprmIter.GetAktId();
+                sal_uInt16 nId = aSprmIter.GetCurrentId();
                 sal_uInt16 nFixedLen = aSprmParser.DistanceToData(nId);
                 sal_uInt16 nL = aSprmParser.GetSprmSize(nId, aSprmIter.GetSprms(), aSprmIter.GetRemLen());
                 sal_uInt16 nLen = nL - nFixedLen;
@@ -3571,9 +3571,9 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
     while (const sal_uInt8* pSprm = aSprmIter.GetSprms())
     {
 #ifdef DEBUGSPRMREADER
-        fprintf(stderr, "id is %x\n", aIter.GetAktId());
+        fprintf(stderr, "id is %x\n", aIter.GetCurrentId());
 #endif
-        pIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetAktId());
+        pIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetCurrentId());
         aSprmIter.advance();
     }
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 515a2aaec72b..019729fb5f7b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -701,7 +701,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet
             maSprmParser);
         while (const sal_uInt8* pSprm = aSprmIter.GetSprms())
         {
-            rReader.ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetAktId());
+            rReader.ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetCurrentId());
             aSprmIter.advance();
         }
 
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b64d1b7bc616..380c2c8f1fba 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -921,11 +921,11 @@ SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId)
 {
     while (GetSprms())
     {
-        if (GetAktId() == nId)
+        if (GetCurrentId() == nId)
         {
             sal_uInt16 nFixedLen =  mrSprmParser.DistanceToData(nId);
             sal_uInt16 nL = mrSprmParser.GetSprmSize(nId, GetSprms(), GetRemLen());
-            return SprmResult(GetAktParams(), nL - nFixedLen); // SPRM found!
+            return SprmResult(GetCurrentParams(), nL - nFixedLen); // SPRM found!
         }
         advance();
     }
@@ -1181,14 +1181,14 @@ void WW8PLCFx_PCD::advance()
         pPcdI->advance();
 }
 
-WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
+WW8_FC WW8PLCFx_PCD::CurrentPieceStartCp2Fc( WW8_CP nCp )
 {
     WW8_CP nCpStart, nCpEnd;
     void* pData;
 
     if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
     {
-        OSL_ENSURE( false, "AktPieceStartCp2Fc() with false Cp found (1)" );
+        OSL_ENSURE( false, "CurrentPieceStartCp2Fc() with false Cp found (1)" );
         return WW8_FC_MAX;
     }
 
@@ -1234,7 +1234,7 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
     return nRet;
 }
 
-void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
+void WW8PLCFx_PCD::CurrentPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
     const WW8ScannerBase *pSBase )
 {
     //No point going anywhere with this
@@ -1245,13 +1245,13 @@ void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
     rEndPos = pSBase->WW8Fc2Cp( rEndPos );
 }
 
-WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
+WW8_CP WW8PLCFx_PCD::CurrentPieceStartFc2Cp( WW8_FC nStartPos )
 {
     WW8_CP nCpStart, nCpEnd;
     void* pData;
     if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
     {
-        OSL_ENSURE( false, "AktPieceStartFc2Cp() - error" );
+        OSL_ENSURE( false, "CurrentPieceStartFc2Cp() - error" );
         return WW8_CP_MAX;
     }
     bool bIsUnicode = false;
@@ -2772,7 +2772,7 @@ WW8PLCFx_Fc_FKP::WW8Fkp::WW8Fkp(const WW8Fib& rFib, SvStream* pSt,
             WW8SprmIter aIter(pSprms, nLen, maSprmParser);
             while (aIter.GetSprms())
             {
-                fprintf(stderr, "id is %x\n", aIter.GetAktId());
+                fprintf(stderr, "id is %x\n", aIter.GetCurrentId());
                 aIter.advance();
             }
         }
@@ -2932,11 +2932,11 @@ void WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sal_uInt16 nId,
 
     while(aIter.GetSprms())
     {
-        if (aIter.GetAktId() == nId)
+        if (aIter.GetCurrentId() == nId)
         {
             sal_uInt16 nFixedLen = maSprmParser.DistanceToData(nId);
             sal_uInt16 nL = maSprmParser.GetSprmSize(nId, aIter.GetSprms(), aIter.GetRemLen());
-            rResult.emplace_back(aIter.GetAktParams(), nL - nFixedLen);
+            rResult.emplace_back(aIter.GetCurrentParams(), nL - nFixedLen);
         }
         aIter.advance();
     };
@@ -3269,11 +3269,11 @@ void WW8PLCFx_Fc_FKP::HasSprm(sal_uInt16 nId, std::vector<SprmResult> &rResult)
         WW8SprmIter aIter(aDesc.pMemPos, aDesc.nSprmsLen, rSprmParser);
         while(aIter.GetSprms())
         {
-            if (aIter.GetAktId() == nId)
+            if (aIter.GetCurrentId() == nId)
             {
                 sal_uInt16 nFixedLen = rSprmParser.DistanceToData(nId);
                 sal_uInt16 nL = rSprmParser.GetSprmSize(nId, aIter.GetSprms(), aIter.GetRemLen());
-                rResult.emplace_back(aIter.GetAktParams(), nL - nFixedLen);
+                rResult.emplace_back(aIter.GetCurrentParams(), nL - nFixedLen);
             }
             aIter.advance();
         };
@@ -3331,7 +3331,7 @@ bool WW8PLCFx_Cp_FKP::SeekPos(WW8_CP nCpPos)
             return false;
         if (pPCDAttrs && !pPCDAttrs->GetIter()->SeekPos(nCpPos))
             return false;
-        return WW8PLCFx_Fc_FKP::SeekPos(pPcd->AktPieceStartCp2Fc(nCpPos));
+        return WW8PLCFx_Fc_FKP::SeekPos(pPcd->CurrentPieceStartCp2Fc(nCpPos));
     }
                                     // NO piece table !!!
     return WW8PLCFx_Fc_FKP::SeekPos( rSBase.WW8Cp2Fc(nCpPos) );
@@ -3341,7 +3341,7 @@ WW8_CP WW8PLCFx_Cp_FKP::Where()
 {
     WW8_FC nFc = WW8PLCFx_Fc_FKP::Where();
     if( pPcd )
-        return pPcd->AktPieceStartFc2Cp( nFc ); // identify piece
+        return pPcd->CurrentPieceStartFc2Cp( nFc ); // identify piece
     return rSBase.WW8Fc2Cp( nFc );      // NO piece table !!!
 }
 
@@ -3604,7 +3604,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                 pPieceIter->SetIdx( nOldPos );
             }
             else
-                WW8PLCFx_PCD::AktPieceFc2Cp( p->nStartPos, p->nEndPos,&rSBase );
+                WW8PLCFx_PCD::CurrentPieceFc2Cp( p->nStartPos, p->nEndPos,&rSBase );
         }
         else
         {
@@ -3638,7 +3638,7 @@ void WW8PLCFx_Cp_FKP::advance()
     // get Fkp entry
     WW8PLCFx_Fc_FKP::GetSprmsAndPos(nAttrStart, nAttrEnd, nFkpLen);
 
-    WW8PLCFx_PCD::AktPieceFc2Cp( nAttrStart, nAttrEnd, &rSBase );
+    WW8PLCFx_PCD::CurrentPieceFc2Cp( nAttrStart, nAttrEnd, &rSBase );
     bLineEnd = (ePLCF == PAP);
 }
 
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index b78cb2121686..fbaae0131eae 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -286,8 +286,8 @@ public:
     void  advance();
     const sal_uInt8* GetSprms() const
         { return ( pSprms && (0 < nRemLen) ) ? pSprms : nullptr; }
-    const sal_uInt8* GetAktParams() const { return pCurrentParams; }
-    sal_uInt16 GetAktId() const { return nCurrentId; }
+    const sal_uInt8* GetCurrentParams() const { return pCurrentParams; }
+    sal_uInt16 GetCurrentId() const { return nCurrentId; }
     sal_Int32 GetRemLen() const { return nRemLen; }
 
 private:
@@ -481,9 +481,9 @@ public:
     virtual WW8_FC Where() override;
     virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) override;
     virtual void advance() override;
-    WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos );
-    WW8_FC AktPieceStartCp2Fc( WW8_CP nCp );
-    static void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
+    WW8_CP CurrentPieceStartFc2Cp( WW8_FC nStartPos );
+    WW8_FC CurrentPieceStartCp2Fc( WW8_CP nCp );
+    static void CurrentPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
         const WW8ScannerBase *pSBase);
     WW8PLCFpcd_Iter* GetPLCFIter() { return pPcdI.get(); }
     void SetClipStart(WW8_CP nIn) { nClipStart = nIn; }