Kaydet (Commit) 0ff61023 authored tarafından Johnny_M's avatar Johnny_M Kaydeden (comit) Michael Stahl

Translate German variable names

Akt -> Current in itemset

Change-Id: I22f24505c220775fcbbcc64f6fdfc529c772dbe9
Reviewed-on: https://gerrit.libreoffice.org/50312Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 91db89b7
...@@ -373,12 +373,12 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich, ...@@ -373,12 +373,12 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
const SfxPoolItem **ppItem ) const const SfxPoolItem **ppItem ) const
{ {
// Find the range in which the Which is located // Find the range in which the Which is located
const SfxItemSet* pAktSet = this; const SfxItemSet* pCurrentSet = this;
SfxItemState eRet = SfxItemState::UNKNOWN; SfxItemState eRet = SfxItemState::UNKNOWN;
do do
{ {
SfxPoolItem const** ppFnd = pAktSet->m_pItems.get(); SfxPoolItem const** ppFnd = pCurrentSet->m_pItems.get();
const sal_uInt16* pPtr = pAktSet->m_pWhichRanges; const sal_uInt16* pPtr = pCurrentSet->m_pWhichRanges;
if (pPtr) if (pPtr)
{ {
while ( *pPtr ) while ( *pPtr )
...@@ -412,7 +412,7 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich, ...@@ -412,7 +412,7 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
pPtr += 2; pPtr += 2;
} }
} }
} while (bSrchInParent && nullptr != (pAktSet = pAktSet->m_pParent)); } while (bSrchInParent && nullptr != (pCurrentSet = pCurrentSet->m_pParent));
return eRet; return eRet;
} }
...@@ -852,13 +852,13 @@ const SfxPoolItem* SfxItemSet::GetItem(sal_uInt16 nId, bool bSearchInParent) con ...@@ -852,13 +852,13 @@ const SfxPoolItem* SfxItemSet::GetItem(sal_uInt16 nId, bool bSearchInParent) con
const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
{ {
// Search the Range in which the Which is located in: // Search the Range in which the Which is located in:
const SfxItemSet* pAktSet = this; const SfxItemSet* pCurrentSet = this;
do do
{ {
if( pAktSet->Count() ) if( pCurrentSet->Count() )
{ {
SfxPoolItem const** ppFnd = pAktSet->m_pItems.get(); SfxPoolItem const** ppFnd = pCurrentSet->m_pItems.get();
const sal_uInt16* pPtr = pAktSet->m_pWhichRanges; const sal_uInt16* pPtr = pCurrentSet->m_pWhichRanges;
while( *pPtr ) while( *pPtr )
{ {
if( *pPtr <= nWhich && nWhich <= *(pPtr+1) ) if( *pPtr <= nWhich && nWhich <= *(pPtr+1) )
...@@ -890,7 +890,7 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const ...@@ -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?? //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? // if( !*pPtr ) // Until the end of the search Range?
// break; // break;
} while (bSrchInParent && nullptr != (pAktSet = pAktSet->m_pParent)); } while (bSrchInParent && nullptr != (pCurrentSet = pCurrentSet->m_pParent));
// Get the Default from the Pool and return // 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); SAL_WARN_IF(!m_pPool, "svl.items", "no Pool, but status is ambiguous, with ID/pos " << nWhich);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment