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

[Johnny_M]

 svl/source/items/itemset.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0ff61023009d75302c3c1c87962e863f11e89406
Author: Johnny_M <klasse at partyheld.de>
Date:   Sun Feb 25 17:23:15 2018 +0100

    Translate German variable names
    
    Akt -> Current in itemset
    
    Change-Id: I22f24505c220775fcbbcc64f6fdfc529c772dbe9
    Reviewed-on: https://gerrit.libreoffice.org/50312
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 3c0bfa79aec3..9aeacbd0ee9d 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -373,12 +373,12 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
                                         const SfxPoolItem **ppItem ) const
 {
     // Find the range in which the Which is located
-    const SfxItemSet* pAktSet = this;
+    const SfxItemSet* pCurrentSet = this;
     SfxItemState eRet = SfxItemState::UNKNOWN;
     do
     {
-        SfxPoolItem const** ppFnd = pAktSet->m_pItems.get();
-        const sal_uInt16* pPtr = pAktSet->m_pWhichRanges;
+        SfxPoolItem const** ppFnd = pCurrentSet->m_pItems.get();
+        const sal_uInt16* pPtr = pCurrentSet->m_pWhichRanges;
         if (pPtr)
         {
             while ( *pPtr )
@@ -412,7 +412,7 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
                 pPtr += 2;
             }
         }
-    } while (bSrchInParent && nullptr != (pAktSet = pAktSet->m_pParent));
+    } while (bSrchInParent && nullptr != (pCurrentSet = pCurrentSet->m_pParent));
     return eRet;
 }
 
@@ -852,13 +852,13 @@ const SfxPoolItem* SfxItemSet::GetItem(sal_uInt16 nId, bool bSearchInParent) con
 const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
 {
     // Search the Range in which the Which is located in:
-    const SfxItemSet* pAktSet = this;
+    const SfxItemSet* pCurrentSet = this;
     do
     {
-        if( pAktSet->Count() )
+        if( pCurrentSet->Count() )
         {
-            SfxPoolItem const** ppFnd = pAktSet->m_pItems.get();
-            const sal_uInt16* pPtr = pAktSet->m_pWhichRanges;
+            SfxPoolItem const** ppFnd = pCurrentSet->m_pItems.get();
+            const sal_uInt16* pPtr = pCurrentSet->m_pWhichRanges;
             while( *pPtr )
             {
                 if( *pPtr <= nWhich && nWhich <= *(pPtr+1) )
@@ -890,7 +890,7 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
 //TODO: Search until end of Range: What are we supposed to do now? To the Parent or Default??
 //      if( !*pPtr )            // Until the end of the search Range?
 //      break;
-    } while (bSrchInParent && nullptr != (pAktSet = pAktSet->m_pParent));
+    } while (bSrchInParent && nullptr != (pCurrentSet = pCurrentSet->m_pParent));
 
     // Get the Default from the Pool and return
     SAL_WARN_IF(!m_pPool, "svl.items", "no Pool, but status is ambiguous, with ID/pos " << nWhich);