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

[Libreoffice Gerrit user]

 sd/source/filter/ppt/pptin.cxx |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit f2afa2af10d9d30d7160e73881ca6fe5a409f35a
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sun Jan 13 14:09:36 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 20 10:42:33 2019 +0100

    Translate German variable names
    
    Please feel free to suggest a better name, if desired
    
    Change-Id: If182fb9fb4bb922a5d123f8227b3da212e39d29e
    Reviewed-on: https://gerrit.libreoffice.org/66257
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index fcead1a73a22..161137e2d143 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -193,7 +193,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag
 
     if ( mbDocumentFound )
     {
-        sal_uLong nPosMerk = rStCtrl.Tell();
+        sal_uLong nOldPos = rStCtrl.Tell();
 
         pStData = rStorage_.OpenSotStream( "Pictures", StreamMode::STD_READ );
 
@@ -206,7 +206,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag
             if ( SeekToRec( rStCtrl, DFF_msofbtDggContainer, nPPDGLen ) )
                 nDggContainerOfs = rStCtrl.Tell();
         }
-        rStCtrl.Seek( nPosMerk );
+        rStCtrl.Seek( nOldPos );
     }
     sal_uInt32 nSvxMSDffOLEConvFlags2 = 0;
 
@@ -773,7 +773,7 @@ bool ImplSdPPTImport::Import()
 
                 bool bNewAnimationsUsed = false;
                 ProcessData aProcessData( (*pList)[ nCurrentPageNum ], SdPageCapsule(pMPage) );
-                sal_uInt32 nFPosMerk = rStCtrl.Tell();
+                sal_uInt32 nOldFPos = rStCtrl.Tell();
                 DffRecordHeader aPageHd;
                 if ( SeekToCurrentPage( &aPageHd ) )
                 {
@@ -863,7 +863,7 @@ bool ImplSdPPTImport::Import()
                         }
                     }
                 }
-                rStCtrl.Seek( nFPosMerk );
+                rStCtrl.Seek( nOldFPos );
                 ImportPageEffect( pMPage, bNewAnimationsUsed );
 
                 // background object
@@ -905,7 +905,7 @@ bool ImplSdPPTImport::Import()
 
     // importing slide pages
     {
-        sal_uInt32          nFPosMerk = rStCtrl.Tell();
+        sal_uInt32          nOldFPos = rStCtrl.Tell();
         PptPageKind     ePageKind = eCurrentPageKind;
         sal_uInt16          nPageNum = nCurrentPageNum;
 
@@ -1074,7 +1074,7 @@ bool ImplSdPPTImport::Import()
             pSdrModel->InsertPage( pNPage );
         }
         SetPageNum( nPageNum, ePageKind );
-        rStCtrl.Seek( nFPosMerk );
+        rStCtrl.Seek( nOldFPos );
     }
 
     // create handout and note pages
@@ -1510,7 +1510,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97
 
 void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimationsUsed )
 {
-    sal_uLong nFilePosMerk = rStCtrl.Tell();
+    sal_uLong nOldFilePos = rStCtrl.Tell();
 
     // set PageKind at page (up to now only PageKind::Standard or PageKind::Notes)
     if ( pPage->GetPageKind() == PageKind::Standard )
@@ -1869,7 +1869,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
                 pPpt97Animation->createAndSetCustomAnimationEffect( rEntry.first );
         }
     }
-    rStCtrl.Seek( nFilePosMerk );
+    rStCtrl.Seek( nOldFilePos );
 }
 
 // import of sounds
@@ -1879,7 +1879,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
 OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
 {
     OUString aRetval;
-    sal_uInt32 nPosMerk = rStCtrl.Tell();
+    sal_uInt32 nOldPos = rStCtrl.Tell();
     DffRecordHeader aDocHd;
     if ( SeekToDocument( &aDocHd ) )
     {
@@ -1896,7 +1896,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
             {
                 sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos();
                 OUString aRefStr;
-                sal_uInt32 nPosMerk2 = rStCtrl.Tell();
+                sal_uInt32 nOldPos2 = rStCtrl.Tell();
                 if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, nullptr, 2 ) )
                 {
                     if ( ReadString( aRefStr ) )
@@ -1906,7 +1906,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
                 {
                     if ( OUString::number(nSoundRef) == aRefStr )
                     {
-                        rStCtrl.Seek( nPosMerk2 );
+                        rStCtrl.Seek( nOldPos2 );
                         if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen ) )
                         {
                             ReadString( aRetval );
@@ -1939,7 +1939,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
 
                     if ( !bSoundExists )
                     {
-                        rStCtrl.Seek( nPosMerk2 );
+                        rStCtrl.Seek( nOldPos2 );
                         DffRecordHeader aSoundDataRecHd;
                         if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd ) )
                         {
@@ -1986,7 +1986,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
             }
         }
     }
-    rStCtrl.Seek( nPosMerk );
+    rStCtrl.Seek( nOldPos );
     return aRetval;
 }
 
@@ -2662,13 +2662,13 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                         break;
                         case PPT_PST_InteractiveInfo:
                         {
-                            sal_uInt32 nFilePosMerk2 = rSt.Tell();
+                            sal_uInt32 nOldFilePos2 = rSt.Tell();
                             OUString aMacroName;
 
                             if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd ) )
                                 ReadString(aMacroName);
 
-                            rSt.Seek( nFilePosMerk2 );
+                            rSt.Seek( nOldFilePos2 );
                             DffRecordHeader aHdInteractiveInfoAtom;
                             if ( SeekToRec( rSt, PPT_PST_InteractiveInfoAtom, nHdRecEnd, &aHdInteractiveInfoAtom ) )
                             {