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

[Johnny_M]

 sw/source/filter/ww8/wrtw8esh.cxx |    4 ++--
 sw/source/filter/ww8/wrtw8nds.cxx |    6 +++---
 sw/source/filter/ww8/wrtww8.hxx   |   12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 84e236d4c082b289816d626598450dd6ef8471ca
Author: Johnny_M <kla...@partyheld.de>
Date:   Sat Mar 3 19:34:10 2018 +0100

    Translate German variable names
    
    Akt -> Current in MSWordAttrIter
    
    (Other occurrences will be done separately.)
    
    Change-Id: Ibec27cd626399d7c868272ea7f8e906d458a4c9a
    Reviewed-on: https://gerrit.libreoffice.org/50689
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 43457576b0d6..293e0d1ab38d 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1000,7 +1000,7 @@ void MSWord_SdrAttrIter::NextPara( sal_Int32 nPar )
     // the attributes are outputted at start of a paragraph anyway.
     aChrTextAtrArr.clear();
     aChrSetArr.clear();
-    nAktSwPos = nTmpSwPos = 0;
+    nCurrentSwPos = nTmpSwPos = 0;
 
     SfxItemSet aSet( pEditObj->GetParaAttribs( nPara ));
     pEditPool = aSet.GetPool();
@@ -1010,7 +1010,7 @@ void MSWord_SdrAttrIter::NextPara( sal_Int32 nPar )
     nScript = g_pBreakIt->GetBreakIter()->getScriptType( 
pEditObj->GetText(nPara), 0);
 
     pEditObj->GetCharAttribs( nPara, aTextAtrArr );
-    nAktSwPos = SearchNext( 1 );
+    nCurrentSwPos = SearchNext( 1 );
 }
 
 rtl_TextEncoding MSWord_SdrAttrIter::GetNextCharSet() const
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index a5c4c9ecf599..c1b77dad4d26 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -186,7 +186,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const 
SwTextNode& rTextNd) :
     rNd(rTextNd),
     maCharRuns(GetPseudoCharRuns(rTextNd)),
     pCurRedline(nullptr),
-    nAktSwPos(0),
+    nCurrentSwPos(0),
     nCurRedlinePos(SwRedlineTable::npos),
     mrSwFormatDrop(rTextNd.GetSwAttrSet().GetDrop())
 {
@@ -227,7 +227,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const 
SwTextNode& rTextNd) :
         pCurRedline = 
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedline( aPosition, 
&nCurRedlinePos );
     }
 
-    nAktSwPos = SearchNext(1);
+    nCurrentSwPos = SearchNext(1);
 }
 
 sal_Int32 lcl_getMinPos( sal_Int32 pos1, sal_Int32 pos2 )
@@ -1205,7 +1205,7 @@ void SwWW8AttrIter::SplitRun( sal_Int32 nSplitEndPos )
             maCharRuns.insert( ++aIter, aNewEntry);
             maCharRunIter = maCharRuns.begin();
             IterToCurrent();
-            nAktSwPos = SearchNext(1);
+            nCurrentSwPos = SearchNext(1);
             break;
         }
     }
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 5bec4ab6b226..2faa25b2fa52 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1421,7 +1421,7 @@ private:
     std::vector<const EECharAttrib*> aChrTextAtrArr;
     std::vector<rtl_TextEncoding> aChrSetArr;
     sal_Int32 nPara;
-    sal_Int32 nAktSwPos;
+    sal_Int32 nCurrentSwPos;
     sal_Int32 nTmpSwPos;                   // for HasItem()
     rtl_TextEncoding eNdChrSet;
     sal_uInt16 nScript;
@@ -1443,12 +1443,12 @@ public:
 
     bool IsTextAttr(sal_Int32 nSwPos);
 
-    void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( 
nAktSwPos + 1 ); }
+    void NextPos() { if ( nCurrentSwPos < SAL_MAX_INT32 ) nCurrentSwPos = 
SearchNext( nCurrentSwPos + 1 ); }
 
     void OutAttr( sal_Int32 nSwPos );
     virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override;
     virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override;
-    sal_Int32 WhereNext() const                { return nAktSwPos; }
+    sal_Int32 WhereNext() const                { return nCurrentSwPos; }
     rtl_TextEncoding GetNextCharSet() const;
     rtl_TextEncoding GetNodeCharSet() const     { return eNdChrSet; }
 };
@@ -1473,7 +1473,7 @@ private:
     bool mbCharIsRTL;
 
     const SwRangeRedline* pCurRedline;
-    sal_Int32 nAktSwPos;
+    sal_Int32 nCurrentSwPos;
     SwRedlineTable::size_type nCurRedlinePos;
 
     bool mbParaIsRTL;
@@ -1500,7 +1500,7 @@ public:
     bool IsDropCap( int nSwPos );
     bool RequiresImplicitBookmark();
 
-    void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( 
nAktSwPos + 1 ); }
+    void NextPos() { if ( nCurrentSwPos < SAL_MAX_INT32 ) nCurrentSwPos = 
SearchNext( nCurrentSwPos + 1 ); }
 
     void OutAttr( sal_Int32 nSwPos, bool bRuby = false, bool 
bWriteCombinedChars = false );
     virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override;
@@ -1510,7 +1510,7 @@ public:
     const SwRedlineData* GetRunLevelRedline( sal_Int32 nPos );
     FlyProcessingState OutFlys(sal_Int32 nSwPos);
 
-    sal_Int32 WhereNext() const { return nAktSwPos; }
+    sal_Int32 WhereNext() const { return nCurrentSwPos; }
     sal_uInt16 GetScript() const { return mnScript; }
     bool IsParaRTL() const { return mbParaIsRTL; }
     rtl_TextEncoding GetCharSet() const { return meChrSet; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits