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

Translate German variable names

As in f2afa2af

Change-Id: I617544ff00128ec3ff4bc4cff523db55f49c493a
Reviewed-on: https://gerrit.libreoffice.org/68246
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 159e33ec
...@@ -225,7 +225,7 @@ DffPropertyReader::DffPropertyReader( const SvxMSDffManager& rMan ) ...@@ -225,7 +225,7 @@ DffPropertyReader::DffPropertyReader( const SvxMSDffManager& rMan )
void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDgg ) const void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDgg ) const
{ {
const_cast<DffPropertyReader*>(this)->pDefaultPropSet.reset(); const_cast<DffPropertyReader*>(this)->pDefaultPropSet.reset();
sal_uInt32 nMerk = rStCtrl.Tell(); sal_uInt32 nOldPos = rStCtrl.Tell();
bool bOk = checkSeek(rStCtrl, nOffsDgg); bool bOk = checkSeek(rStCtrl, nOffsDgg);
DffRecordHeader aRecHd; DffRecordHeader aRecHd;
if (bOk) if (bOk)
...@@ -238,7 +238,7 @@ void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDg ...@@ -238,7 +238,7 @@ void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDg
ReadDffPropSet( rStCtrl, *pDefaultPropSet ); ReadDffPropSet( rStCtrl, *pDefaultPropSet );
} }
} }
rStCtrl.Seek( nMerk ); rStCtrl.Seek( nOldPos );
} }
#ifdef DBG_CUSTOMSHAPE #ifdef DBG_CUSTOMSHAPE
...@@ -3178,7 +3178,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient ...@@ -3178,7 +3178,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient
bool bRet = false; bool bRet = false;
if ( !maFidcls.empty() ) if ( !maFidcls.empty() )
{ {
sal_uInt32 nMerk = rSt.Tell(); sal_uInt32 nOldPos = rSt.Tell();
sal_uInt32 nSec = ( nId >> 10 ) - 1; sal_uInt32 nSec = ( nId >> 10 ) - 1;
if ( nSec < mnIdClusters ) if ( nSec < mnIdClusters )
{ {
...@@ -3223,7 +3223,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient ...@@ -3223,7 +3223,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient
} }
} }
if ( !bRet ) if ( !bRet )
rSt.Seek( nMerk ); rSt.Seek( nOldPos );
} }
return bRet; return bRet;
} }
...@@ -3231,7 +3231,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient ...@@ -3231,7 +3231,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, SvxMSDffClientData* /* pClient
bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount )
{ {
bool bRet = false; bool bRet = false;
sal_uLong nFPosMerk = rSt.Tell(); // store FilePos to restore it later if necessary sal_uLong nOldFPos = rSt.Tell(); // store FilePos to restore it later if necessary
do do
{ {
DffRecordHeader aHd; DffRecordHeader aHd;
...@@ -3268,14 +3268,14 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa ...@@ -3268,14 +3268,14 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa
} }
while ( rSt.good() && rSt.Tell() < nMaxFilePos && !bRet ); while ( rSt.good() && rSt.Tell() < nMaxFilePos && !bRet );
if ( !bRet ) if ( !bRet )
rSt.Seek( nFPosMerk ); // restore original FilePos rSt.Seek( nOldFPos ); // restore original FilePos
return bRet; return bRet;
} }
bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos ) const bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos ) const
{ {
bool bRet = false; bool bRet = false;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for conditionally later restoration sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for conditionally later restoration
do do
{ {
DffRecordHeader aHd; DffRecordHeader aHd;
...@@ -3300,7 +3300,7 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uL ...@@ -3300,7 +3300,7 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uL
} }
while ( rStCtrl.good() && rStCtrl.Tell() < nMaxFilePos && !bRet ); while ( rStCtrl.good() && rStCtrl.Tell() < nMaxFilePos && !bRet );
if ( !bRet ) if ( !bRet )
rStCtrl.Seek( nFPosMerk ); // restore FilePos rStCtrl.Seek( nOldFPos ); // restore FilePos
return bRet; return bRet;
} }
...@@ -5782,7 +5782,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) ...@@ -5782,7 +5782,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
if (!nOffsDggL) if (!nOffsDggL)
return; return;
sal_uInt32 nDummy, nMerk = rStCtrl.Tell(); sal_uInt32 nDummy, nOldPos = rStCtrl.Tell();
if (nOffsDggL == rStCtrl.Seek(nOffsDggL)) if (nOffsDggL == rStCtrl.Seek(nOffsDggL))
{ {
...@@ -5820,7 +5820,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) ...@@ -5820,7 +5820,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
} }
} }
} }
rStCtrl.Seek( nMerk ); rStCtrl.Seek( nOldPos );
} }
void SvxMSDffManager::CheckTxBxStoryChain() void SvxMSDffManager::CheckTxBxStoryChain()
......
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