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

[Johnny_M]

 sw/source/filter/html/swhtml.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e91822494f4a4575bad0f0b305f4df04bee80840
Author: Johnny_M <kla...@partyheld.de>
Date:   Sat Mar 10 12:07:35 2018 +0100

    Translate German variable names
    
    Akt -> Current in swhtml
    
    Change-Id: I54cad4bfd4ae411d397426deab9236fe3cb0c008
    Reviewed-on: https://gerrit.libreoffice.org/51034
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0b0cecace0f0..63c6c8c53ea5 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -771,7 +771,7 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false 
).nNode.GetIndex() )
         SwPosition* pPos = m_pPam->GetPoint();
         if( !pPos->nContent.GetIndex() && !bLFStripped )
         {
-            SwTextNode* pAktNd;
+            SwTextNode* pCurrentNd;
             sal_uLong nNodeIdx = pPos->nNode.GetIndex();
 
             bool bHasFlysOrMarks =
@@ -803,16 +803,16 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false 
).nNode.GetIndex() )
                     }
                 }
             }
-            else if( nullptr != ( pAktNd = m_xDoc->GetNodes()[ nNodeIdx 
]->GetTextNode()) && !bHasFlysOrMarks )
+            else if( nullptr != ( pCurrentNd = m_xDoc->GetNodes()[ nNodeIdx 
]->GetTextNode()) && !bHasFlysOrMarks )
             {
-                if( pAktNd->CanJoinNext( &pPos->nNode ))
+                if( pCurrentNd->CanJoinNext( &pPos->nNode ))
                 {
                     SwTextNode* pNextNd = pPos->nNode.GetNode().GetTextNode();
                     pPos->nContent.Assign( pNextNd, 0 );
                     m_pPam->SetMark(); m_pPam->DeleteMark();
                     pNextNd->JoinPrev();
                 }
-                else if (pAktNd->GetText().isEmpty())
+                else if (pCurrentNd->GetText().isEmpty())
                 {
                     pPos->nContent.Assign( nullptr, 0 );
                     m_pPam->SetMark(); m_pPam->DeleteMark();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits