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

Johnny_M klasse at partyheld.de
Wed Mar 28 16:13:16 UTC 2018


 sw/source/filter/ww8/wrtww8.hxx |    2 +-
 sw/source/filter/ww8/ww8atr.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0562808a7ef1fe3ee6ae094bb120e0be84e67856
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 24 12:57:54 2018 +0100

    Translate German function names
    
    Akt -> Current in ww8
    
    Change-Id: I3beb046cbce7727c7ff485de9ff956ee087c443c
    Reviewed-on: https://gerrit.libreoffice.org/51802
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index f56c81ce3d8d..63f047ce8e44 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -816,7 +816,7 @@ protected:
     void AddLinkTarget( const OUString& rURL );
     void CollectOutlineBookmarks( const SwDoc &rDoc );
 
-    bool SetAktPageDescFromNode(const SwNode &rNd);
+    bool SetCurrentPageDescFromNode(const SwNode &rNd);
     bool ContentContainsChapterField(const SwFormatContent &rContent) const;
     bool FormatHdFtContainsChapterField(const SwFrameFormat &rFormat) const;
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 285716d280cc..1cbbeebf27f6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -371,7 +371,7 @@ bool MSWordExportBase::FormatHdFtContainsChapterField(const SwFrameFormat &rForm
     return pFormat && ContentContainsChapterField( pFormat->GetContent() );
 }
 
-bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd)
+bool MSWordExportBase::SetCurrentPageDescFromNode(const SwNode &rNd)
 {
     bool bNewPageDesc = false;
     const SwPageDesc* pCurrent = SwPageDesc::GetPageDescOfNode(rNd);
@@ -513,7 +513,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                     if ( pBreak &&
                          pBreak->GetBreak() == SvxBreak::PageBefore )
                     {
-                        bNewPageDesc |= SetAktPageDescFromNode( rNd );
+                        bNewPageDesc |= SetCurrentPageDescFromNode( rNd );
                     }
                     if( isTextNodeEmpty )
                        bNewPageDesc = false;
@@ -555,7 +555,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     {
         OSL_ENSURE( m_pCurrentPageDesc, "should not be possible" );
         if ( m_pCurrentPageDesc )
-            bNewPageDesc = SetAktPageDescFromNode( rNd );
+            bNewPageDesc = SetCurrentPageDescFromNode( rNd );
     }
 
     if ( bNewPageDesc && m_pCurrentPageDesc )


More information about the Libreoffice-commits mailing list