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

[Miklos Vajna]

 sw/source/filter/html/swhtml.hxx            |    2 +-
 sw/source/filter/ww8/wrtw8sty.cxx           |    4 ++--
 sw/source/filter/ww8/ww8attributeoutput.hxx |    4 ++--
 sw/source/filter/ww8/ww8par.hxx             |    2 +-
 sw/source/filter/ww8/ww8par5.cxx            |    8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 104e2278fcfd82423d6341bd214a1df0b319aa1c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 2 08:43:44 2016 +0200

    sw: translate last Anz occurrences in headers
    
    Change-Id: I36e11fe9b5a8979478029162e0f51015fc1360fb
    Reviewed-on: https://gerrit.libreoffice.org/24583
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 92071fe..c7be889 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -418,7 +418,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     size_t m_nParaCnt;
     size_t m_nContextStMin;           // Untergrenze fuer PopContext
     size_t m_nContextStAttrMin;       // Untergrenze fuer Attributierung
-    sal_uInt16  m_nSelectEntryCnt;    // Anzahl der Eintraege der akt. Listbox
+    sal_uInt16  m_nSelectEntryCnt;    // Number of entries in the actual listbox
     sal_uInt16  m_nOpenParaToken;     // ein geoeffnetes Absatz-Element
 
     enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 632ed2e..123f23a 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -653,7 +653,7 @@ void WW8AttributeOutput::StartStyles()
         ++nCurPos;
     }
     rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
-    m_nStyAnzPos = nCurPos + 2;     // Anzahl wird nachgetragen
+    m_nStyleCountPos = nCurPos + 2;     // Anzahl wird nachgetragen
 
     static sal_uInt8 aStShi[] = {
         0x12, 0x00,
@@ -669,7 +669,7 @@ void WW8AttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles )
     WW8Fib& rFib = *m_rWW8Export.pFib;
 
     rFib.lcbStshfOrig = rFib.lcbStshf = m_rWW8Export.pTableStrm->Tell() - rFib.fcStshf;
-    SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, m_nStyAnzPos, nNumberOfStyles );
+    SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, m_nStyleCountPos, nNumberOfStyles );
 }
 
 void MSWordStyles::OutputStylesTable()
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 1a1f1d6..f48eb38 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -445,7 +445,7 @@ protected:
     /// For output of styles.
     ///
     /// Used between StartStyles() and EndStyles().
-    sal_uLong m_nStyAnzPos;
+    sal_uLong m_nStyleCountPos;
 
     /// For output of run properties.
     ///
@@ -463,7 +463,7 @@ public:
         , nPOPosStdLen2(0)
         , m_nStyleStartSize(0)
         , m_nStyleLenPos(0)
-        , m_nStyAnzPos(0)
+        , m_nStyleCountPos(0)
         , m_nFieldResults(0)
         , mbOnTOXEnding(false)
     {
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 4ef50eb..51fae4b 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1840,7 +1840,7 @@ public:     // really private, but can only be done public
     bool ForceFieldLanguage(SwField &rField, sal_uInt16 nLang);
     eF_ResT Read_F_DateTime( WW8FieldDesc*, OUString& rStr );
     eF_ResT Read_F_FileName( WW8FieldDesc*, OUString& rStr);
-    eF_ResT Read_F_Anz( WW8FieldDesc* pF, OUString& );
+    eF_ResT Read_F_Num( WW8FieldDesc* pF, OUString& );
     eF_ResT Read_F_CurPage( WW8FieldDesc*, OUString& );
     eF_ResT Read_F_Ref( WW8FieldDesc* pF, OUString& );
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e192acd..0995cad 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -758,9 +758,9 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
         &SwWW8ImplReader::Read_F_DocInfo,           // 23
         &SwWW8ImplReader::Read_F_DocInfo,           // 24
         &SwWW8ImplReader::Read_F_DocInfo,           // 25
-        &SwWW8ImplReader::Read_F_Anz,               // 26
-        &SwWW8ImplReader::Read_F_Anz,               // 27
-        &SwWW8ImplReader::Read_F_Anz,               // 28
+        &SwWW8ImplReader::Read_F_Num,               // 26
+        &SwWW8ImplReader::Read_F_Num,               // 27
+        &SwWW8ImplReader::Read_F_Num,               // 28
         &SwWW8ImplReader::Read_F_FileName,          // 29
         &SwWW8ImplReader::Read_F_TemplName,         // 30
         &SwWW8ImplReader::Read_F_DateTime,          // 31
@@ -1817,7 +1817,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
     return FLD_OK;
 }
 
-eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr )
+eF_ResT SwWW8ImplReader::Read_F_Num( WW8FieldDesc* pF, OUString& rStr )
 {
     sal_uInt16 nSub = DS_PAGE;                  // page number
     switch ( pF->nId ){