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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Dec 4 10:28:13 UTC 2018


 sw/source/core/inc/UndoTable.hxx |    4 ++--
 sw/source/core/undo/untbl.cxx    |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 5726f563550a14f761bba7fbd813dc67ee230caa
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sun Dec 2 12:16:01 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Dec 4 11:27:52 2018 +0100

    Translate German variable names
    
    Change-Id: Ie287f9122d4ac362b533cb9270e60337c4985113
    Reviewed-on: https://gerrit.libreoffice.org/64423
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index bc262a51f5f1..30882e9808de 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -78,7 +78,7 @@ class SwUndoTextToTable : public SwUndo, public SwUndRng
     std::vector<sal_uLong> mvDelBoxes;
     std::unique_ptr<SwTableAutoFormat> pAutoFormat;
     SwHistory* pHistory;
-    sal_Unicode const cTrenner;
+    sal_Unicode const cSeparator;
     sal_uInt16 const nAdjust;
     bool bSplitEnd : 1;
 
@@ -105,7 +105,7 @@ class SwUndoTableToText : public SwUndo
     SwTableToTextSaves m_vBoxSaves;
     std::unique_ptr<SwHistory> pHistory;
     sal_uLong nSttNd, nEndNd;
-    sal_Unicode const cTrenner;
+    sal_Unicode const cSeparator;
     sal_uInt16 const nHdlnRpt;
     bool bCheckNumFormat : 1;
 
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 7375489253a5..798909f7335b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -398,7 +398,7 @@ SwUndoTableToText::SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh )
     : SwUndo( SwUndoId::TABLETOTEXT, rTable.GetFrameFormat()->GetDoc() ),
     sTableNm( rTable.GetFrameFormat()->GetName() ),
     nSttNd( 0 ), nEndNd( 0 ),
-    cTrenner( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() )
+    cSeparator( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() )
 {
     pTableSave.reset( new SaveTable( rTable ) );
     m_vBoxSaves.reserve(rTable.GetTabSortBoxes().size());
@@ -643,7 +643,7 @@ void SwUndoTableToText::RedoImpl(::sw::UndoRedoContext & rContext)
     if( auto pDDETable = dynamic_cast<const SwDDETable *>(&pTableNd->GetTable()) )
         pDDEFieldType.reset( static_cast<SwDDEFieldType*>(pDDETable->GetDDEFieldType()->Copy()) );
 
-    rDoc.TableToText( pTableNd, cTrenner );
+    rDoc.TableToText( pTableNd, cSeparator );
 
     ++aSaveIdx;
     SwContentNode* pCNd = aSaveIdx.GetNode().GetContentNode();
@@ -672,7 +672,7 @@ void SwUndoTableToText::RepeatImpl(::sw::RepeatContext & rContext)
         pPam->SetMark();
         pPam->DeleteMark();
 
-        rContext.GetDoc().TableToText( pTableNd, cTrenner );
+        rContext.GetDoc().TableToText( pTableNd, cSeparator );
     }
 }
 
@@ -692,7 +692,7 @@ SwUndoTextToTable::SwUndoTextToTable( const SwPaM& rRg,
                                 sal_Unicode cCh, sal_uInt16 nAdj,
                                 const SwTableAutoFormat* pAFormat )
     : SwUndo( SwUndoId::TEXTTOTABLE, rRg.GetDoc() ), SwUndRng( rRg ), aInsTableOpts( rInsTableOpts ),
-      pHistory( nullptr ), cTrenner( cCh ), nAdjust( nAdj )
+      pHistory( nullptr ), cSeparator( cCh ), nAdjust( nAdj )
 {
     if( pAFormat )
         pAutoFormat.reset( new SwTableAutoFormat( *pAFormat ) );
@@ -746,7 +746,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
     }
 
     SwNodeIndex aEndIdx( *pTNd->EndOfSectionNode() );
-    rDoc.TableToText( pTNd, 0x0b == cTrenner ? 0x09 : cTrenner );
+    rDoc.TableToText( pTNd, 0x0b == cSeparator ? 0x09 : cSeparator );
 
     // join again at start?
     SwPaM aPam(rDoc.GetNodes().GetEndOfContent());
@@ -795,7 +795,7 @@ void SwUndoTextToTable::RedoImpl(::sw::UndoRedoContext & rContext)
     SetPaM(rPam);
 
     SwTable const*const pTable = rContext.GetDoc().TextToTable(
-                aInsTableOpts, rPam, cTrenner, nAdjust, pAutoFormat.get() );
+                aInsTableOpts, rPam, cSeparator, nAdjust, pAutoFormat.get() );
     static_cast<SwFrameFormat*>(pTable->GetFrameFormat())->SetName( sTableNm );
 }
 
@@ -805,7 +805,7 @@ void SwUndoTextToTable::RepeatImpl(::sw::RepeatContext & rContext)
     if (!rContext.GetRepeatPaM().GetNode().FindTableNode())
     {
         rContext.GetDoc().TextToTable( aInsTableOpts, rContext.GetRepeatPaM(),
-                                        cTrenner, nAdjust,
+                                        cSeparator, nAdjust,
                                         pAutoFormat.get() );
     }
 }


More information about the Libreoffice-commits mailing list